diff options
| -rw-r--r-- | Install/.gitignore | 3 | ||||
| -rw-r--r-- | Install/Zip2008.list | 7 | ||||
| -rw-r--r-- | Install/settings.example.ini | 31 | ||||
| -rw-r--r-- | Install/users.example.ini | 8 | ||||
| -rw-r--r-- | Install/webadmin.example.ini | 6 | ||||
| -rw-r--r-- | MCServer/banned.example.ini (renamed from Install/banned.example.ini) | 6 | ||||
| -rw-r--r-- | MCServer/groups.example.ini (renamed from Install/groups.example.ini) | 0 | ||||
| -rw-r--r-- | MCServer/groups.ini | 17 | ||||
| -rw-r--r-- | MCServer/users.example.ini (renamed from MCServer/users.ini) | 0 | ||||
| -rw-r--r-- | MCServer/whitelist.example.ini (renamed from Install/whitelist.example.ini) | 12 | ||||
| -rw-r--r-- | Nightbuild2008.cmd | 3 | ||||
| -rw-r--r-- | UpdateVersions.cmd | 39 |
12 files changed, 16 insertions, 116 deletions
diff --git a/Install/.gitignore b/Install/.gitignore index 4f8f2e7cb..3b0a53050 100644 --- a/Install/.gitignore +++ b/Install/.gitignore @@ -1,3 +1,4 @@ MCServer.exe *.7z -*.tag
\ No newline at end of file +*.tag +*.example.ini
\ No newline at end of file diff --git a/Install/Zip2008.list b/Install/Zip2008.list index b611bf832..0b45d81f3 100644 --- a/Install/Zip2008.list +++ b/Install/Zip2008.list @@ -6,13 +6,10 @@ ..\MCServer\items.ini ..\MCServer\monsters.ini MCServer*debug.cmd -banned.example.ini -groups.example.ini +*.example.ini Lua-LICENSE.txt LuaExpat-license.html LuaSQLite3-LICENSE.txt MersenneTwister-LICENSE.txt settings.example.ini -users.example.ini -webadmin.example.ini -whitelist.example.ini
\ No newline at end of file +webadmin.example.ini
\ No newline at end of file diff --git a/Install/settings.example.ini b/Install/settings.example.ini deleted file mode 100644 index 46f92ef74..000000000 --- a/Install/settings.example.ini +++ /dev/null @@ -1,31 +0,0 @@ -[Server] -Port=25565 -MaxPlayers=42 -Description=MCServer - Slightly more custom! - -[Worlds] -DefaultWorld=world -;World=world_sexy - -[Plugins] -NewPlugin=Core -NewPlugin=ChatLog - -[HelpPlugin] -ShowPluginNames=1 - -[Physics] -Water=0 - -[Redstone] -SimulateRedstone=0 - -[Monsters] -AnimalsOn=0 -AnimalSpawnInterval=10 -Types=Spider,Chicken,Cow,Pig,Sheep,Squid,Enderman,Zombiepigman,Cavespider,Creeper,Ghast,Silverfish,Skeleton,Slime,Spider,Zombie - -[Authentication] -Server=session.minecraft.net -Address=/game/checkserver.jsp?user=%USERNAME%&serverId=%SERVERID% -Authenticate=0 diff --git a/Install/users.example.ini b/Install/users.example.ini deleted file mode 100644 index 2065d3e37..000000000 --- a/Install/users.example.ini +++ /dev/null @@ -1,8 +0,0 @@ -[SomeAdmin] -Groups=Admins - -[FancyModerator] -Groups=Moderators - -[ImportantPerson] -Groups=Vips
\ No newline at end of file diff --git a/Install/webadmin.example.ini b/Install/webadmin.example.ini deleted file mode 100644 index 5d6b24063..000000000 --- a/Install/webadmin.example.ini +++ /dev/null @@ -1,6 +0,0 @@ -[WebAdmin] -Enabled=1 -Port=8080 - -[User:admin] -Password=admin
\ No newline at end of file diff --git a/Install/banned.example.ini b/MCServer/banned.example.ini index ba53ec59f..ceb71fe0b 100644 --- a/Install/banned.example.ini +++ b/MCServer/banned.example.ini @@ -1,3 +1,3 @@ -[Banned]
-;PlayerName=1
-
+[Banned] +;PlayerName=1 + diff --git a/Install/groups.example.ini b/MCServer/groups.example.ini index 87b28b70d..87b28b70d 100644 --- a/Install/groups.example.ini +++ b/MCServer/groups.example.ini diff --git a/MCServer/groups.ini b/MCServer/groups.ini deleted file mode 100644 index 87b28b70d..000000000 --- a/MCServer/groups.ini +++ /dev/null @@ -1,17 +0,0 @@ -[Admins] -Permissions=* -Color=c - -[Mods] -Color=5 -Inherits=Vips -Permissions=core.time,core.item - -[Vips] -Permissions=core.teleport -Color=2 -Inherits=Default - -[Default] -Permissions=core.build,core.help,core.playerlist,core.pluginlist,core.spawn -Color=7
\ No newline at end of file diff --git a/MCServer/users.ini b/MCServer/users.example.ini index 6726c0bf8..6726c0bf8 100644 --- a/MCServer/users.ini +++ b/MCServer/users.example.ini diff --git a/Install/whitelist.example.ini b/MCServer/whitelist.example.ini index 7e06ba8d4..a89c148c9 100644 --- a/Install/whitelist.example.ini +++ b/MCServer/whitelist.example.ini @@ -1,6 +1,6 @@ -[WhiteListSettings]
-WhiteListOn=0
-
-[WhiteList]
-;PlayerName=1
-
+[WhiteListSettings] +WhiteListOn=0 + +[WhiteList] +;PlayerName=1 + diff --git a/Nightbuild2008.cmd b/Nightbuild2008.cmd index fdd5d3de1..11e2b3683 100644 --- a/Nightbuild2008.cmd +++ b/Nightbuild2008.cmd @@ -92,6 +92,9 @@ if errorlevel 1 goto haderror +:: Copy all the example ini files into the Install folder for zipping: +copy MCServer\*.example.ini Install\*.example.ini + :: Use 7-zip to compress the resulting files into a single file: set FILESUFFIX=%MYYEAR%_%MYMONTH%_%MYDAY%_%MYTIME%_%COMMITID% echo FILESUFFIX=%FILESUFFIX% diff --git a/UpdateVersions.cmd b/UpdateVersions.cmd deleted file mode 100644 index 1d4b00bca..000000000 --- a/UpdateVersions.cmd +++ /dev/null @@ -1,39 +0,0 @@ -@echo off -:: UpdateVersions.cmd -:: This script processes all *.template files into their non-templated variants using subwcrev, substituting WC-related keywords in the process -:: subwcrev is expected to be in path; you can pass the correct path for your system as env var "subwcrev" - - -:: Subwcrev (from TortoiseSVN, for querying revision number; by default in PATH): -if %subwcrev%a == a set subwcrev=subwcrev - - - - -:: Copy all *.template files into their non-template versions, substituting SVN keywords: -for /r %%X in (*.template) do ( - %subwcrev% . "%%X" "%%~dpX%%~nX" - if errorlevel 1 goto haderror -) - - -goto end - - - - -:haderror -echo an error was encountered, check command output above -pause -goto finished - - - - - -:end -if "a%1" == "a" pause - - - -:finished
\ No newline at end of file |