From b901d62013d75b78f1c0ad722ac6245b534f879e Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Tue, 5 Nov 2013 20:54:54 +0000 Subject: [PATCH] use /data/network/demos/ folder instead such folder for each language git-svn-id: svn://kolibrios.org@4182 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/{eng => common}/network/ftpd.ini | 0 data/{eng => common}/network/users.ini | 0 data/eng/Makefile | 4 ++-- data/et/Makefile | 4 ++-- data/et/network/ftpd.ini | 8 -------- data/et/network/users.ini | 20 -------------------- data/it/Makefile | 4 ++-- data/it/network/ftpd.ini | 8 -------- data/it/network/users.ini | 20 -------------------- data/rus/Makefile | 4 ++-- data/rus/network/ftpd.ini | 8 -------- data/rus/network/users.ini | 20 -------------------- data/sp/Makefile | 4 ++-- data/sp/network/ftpd.ini | 8 -------- data/sp/network/users.ini | 20 -------------------- 15 files changed, 10 insertions(+), 122 deletions(-) rename data/{eng => common}/network/ftpd.ini (100%) rename data/{eng => common}/network/users.ini (100%) delete mode 100644 data/et/network/ftpd.ini delete mode 100644 data/et/network/users.ini delete mode 100644 data/it/network/ftpd.ini delete mode 100644 data/it/network/users.ini delete mode 100644 data/rus/network/ftpd.ini delete mode 100644 data/rus/network/users.ini delete mode 100644 data/sp/network/ftpd.ini delete mode 100644 data/sp/network/users.ini diff --git a/data/eng/network/ftpd.ini b/data/common/network/ftpd.ini similarity index 100% rename from data/eng/network/ftpd.ini rename to data/common/network/ftpd.ini diff --git a/data/eng/network/users.ini b/data/common/network/users.ini similarity index 100% rename from data/eng/network/users.ini rename to data/common/network/users.ini diff --git a/data/eng/Makefile b/data/eng/Makefile index 611e4942cd..0e82a0b6df 100644 --- a/data/eng/Makefile +++ b/data/eng/Makefile @@ -328,8 +328,8 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \ ../common/media/ImgF/dither.obj:MEDIA/ImgF/dither.obj \ ../common/media/ImgF/invSol.obj:MEDIA/ImgF/invSol.obj \ settings/network.ini:SETTINGS/NETWORK.INI \ - network/ftpd.ini:NETWORK/FTPD.INI \ - network/users.ini:NETWORK/USERS.INI \ + ../common/network/ftpd.ini:NETWORK/FTPD.INI \ + ../common/network/users.ini:NETWORK/USERS.INI \ #end of list # Generate skins list understandable by gnu make diff --git a/data/et/Makefile b/data/et/Makefile index 42254b91ea..2dd2842d74 100644 --- a/data/et/Makefile +++ b/data/et/Makefile @@ -329,8 +329,8 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \ ../common/media/ImgF/dither.obj:MEDIA/ImgF/dither.obj \ ../common/media/ImgF/invSol.obj:MEDIA/ImgF/invSol.obj \ settings/network.ini:SETTINGS/NETWORK.INI \ - network/ftpd.ini:NETWORK/FTPD.INI \ - network/users.ini:NETWORK/USERS.INI \ + ../common/network/ftpd.ini:NETWORK/FTPD.INI \ + ../common/network/users.ini:NETWORK/USERS.INI \ #end of list # Generate skins list understandable by gnu make diff --git a/data/et/network/ftpd.ini b/data/et/network/ftpd.ini deleted file mode 100644 index 216d00a2c4..0000000000 --- a/data/et/network/ftpd.ini +++ /dev/null @@ -1,8 +0,0 @@ -[ftpd] -port=21 -conn=10 -ip=127.0.0.1 - -[pasv] -start=2000 -end=5000 \ No newline at end of file diff --git a/data/et/network/users.ini b/data/et/network/users.ini deleted file mode 100644 index 85927c4354..0000000000 --- a/data/et/network/users.ini +++ /dev/null @@ -1,20 +0,0 @@ -; Access modes -; -; List = 1 -; Read = 2 -; Write = 4 -; Delete = 8 -; Change directory = 16 - - -[anonymous] -; leavy pass empty to disable it -pass= -home=/rd/1/ -mode=3 - -[test] -pass=1234 -home=/rd/1/ -mode=31 - diff --git a/data/it/Makefile b/data/it/Makefile index 148d91c27e..ca3c352265 100644 --- a/data/it/Makefile +++ b/data/it/Makefile @@ -328,8 +328,8 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \ ../common/media/ImgF/dither.obj:MEDIA/ImgF/dither.obj \ ../common/media/ImgF/invSol.obj:MEDIA/ImgF/invSol.obj \ settings/network.ini:SETTINGS/NETWORK.INI \ - network/ftpd.ini:NETWORK/FTPD.INI \ - network/users.ini:NETWORK/USERS.INI \ + ../common/network/ftpd.ini:NETWORK/FTPD.INI \ + ../common/network/users.ini:NETWORK/USERS.INI \ #end of list # Generate skins list understandable by gnu make diff --git a/data/it/network/ftpd.ini b/data/it/network/ftpd.ini deleted file mode 100644 index 216d00a2c4..0000000000 --- a/data/it/network/ftpd.ini +++ /dev/null @@ -1,8 +0,0 @@ -[ftpd] -port=21 -conn=10 -ip=127.0.0.1 - -[pasv] -start=2000 -end=5000 \ No newline at end of file diff --git a/data/it/network/users.ini b/data/it/network/users.ini deleted file mode 100644 index 85927c4354..0000000000 --- a/data/it/network/users.ini +++ /dev/null @@ -1,20 +0,0 @@ -; Access modes -; -; List = 1 -; Read = 2 -; Write = 4 -; Delete = 8 -; Change directory = 16 - - -[anonymous] -; leavy pass empty to disable it -pass= -home=/rd/1/ -mode=3 - -[test] -pass=1234 -home=/rd/1/ -mode=31 - diff --git a/data/rus/Makefile b/data/rus/Makefile index 40a5ddd7ad..c834eceb6f 100644 --- a/data/rus/Makefile +++ b/data/rus/Makefile @@ -323,8 +323,8 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \ ../common/media/ImgF/dither.obj:MEDIA/ImgF/dither.obj \ ../common/media/ImgF/invSol.obj:MEDIA/ImgF/invSol.obj \ settings/network.ini:SETTINGS/NETWORK.INI \ - network/ftpd.ini:NETWORK/FTPD.INI \ - network/users.ini:NETWORK/USERS.INI \ + ../common/network/ftpd.ini:NETWORK/FTPD.INI \ + ../common/network/users.ini:NETWORK/USERS.INI \ #end of list #3d/logio.bmp:3D/LOGIO.BMP 3d/cubetext:3D/CUBETEXT diff --git a/data/rus/network/ftpd.ini b/data/rus/network/ftpd.ini deleted file mode 100644 index 216d00a2c4..0000000000 --- a/data/rus/network/ftpd.ini +++ /dev/null @@ -1,8 +0,0 @@ -[ftpd] -port=21 -conn=10 -ip=127.0.0.1 - -[pasv] -start=2000 -end=5000 \ No newline at end of file diff --git a/data/rus/network/users.ini b/data/rus/network/users.ini deleted file mode 100644 index 85927c4354..0000000000 --- a/data/rus/network/users.ini +++ /dev/null @@ -1,20 +0,0 @@ -; Access modes -; -; List = 1 -; Read = 2 -; Write = 4 -; Delete = 8 -; Change directory = 16 - - -[anonymous] -; leavy pass empty to disable it -pass= -home=/rd/1/ -mode=3 - -[test] -pass=1234 -home=/rd/1/ -mode=31 - diff --git a/data/sp/Makefile b/data/sp/Makefile index 113ced9f05..a124672263 100644 --- a/data/sp/Makefile +++ b/data/sp/Makefile @@ -328,8 +328,8 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \ ../common/media/ImgF/dither.obj:MEDIA/ImgF/dither.obj \ ../common/media/ImgF/invSol.obj:MEDIA/ImgF/invSol.obj \ settings/network.ini:SETTINGS/NETWORK.INI \ - network/ftpd.ini:NETWORK/FTPD.INI \ - network/users.ini:NETWORK/USERS.INI \ + ../common/network/ftpd.ini:NETWORK/FTPD.INI \ + ../common/network/users.ini:NETWORK/USERS.INI \ #end of list # Generate skins list understandable by gnu make diff --git a/data/sp/network/ftpd.ini b/data/sp/network/ftpd.ini deleted file mode 100644 index 216d00a2c4..0000000000 --- a/data/sp/network/ftpd.ini +++ /dev/null @@ -1,8 +0,0 @@ -[ftpd] -port=21 -conn=10 -ip=127.0.0.1 - -[pasv] -start=2000 -end=5000 \ No newline at end of file diff --git a/data/sp/network/users.ini b/data/sp/network/users.ini deleted file mode 100644 index 85927c4354..0000000000 --- a/data/sp/network/users.ini +++ /dev/null @@ -1,20 +0,0 @@ -; Access modes -; -; List = 1 -; Read = 2 -; Write = 4 -; Delete = 8 -; Change directory = 16 - - -[anonymous] -; leavy pass empty to disable it -pass= -home=/rd/1/ -mode=3 - -[test] -pass=1234 -home=/rd/1/ -mode=31 -