From: Martin Taibr <taibr.martin@gmail.com>
Date: Sat, 17 Feb 2018 17:19:50 +0000 (+0100)
Subject: rename all the configs
X-Git-Tag: xonotic-v0.8.5~183^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F36%2Fhead;p=xonotic%2Fxonotic.git

rename all the configs
---

diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index 13cc2bcc..0b30a9bd 100644
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -88,7 +88,7 @@ release_common()
 
 	getversion()
 	{
-		gv=`grep "^gameversion " "$1/defaultXonotic.cfg" | awk '{ print $2 }'`
+		gv=`grep "^gameversion " "$1/xonotic-common.cfg" | awk '{ print $2 }'`
 		major=$(($gv / 10000))
 		minor=$((($gv / 100) - ($major * 100)))
 		patch=$(($gv - ($major * 10000) - ($minor * 100)))
@@ -409,21 +409,21 @@ case "$cmd" in
 					s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;
 					s/^gameversion_min [0-9]*/gameversion_min     0/;
 					s/^gameversion_max [0-9]*/gameversion_max  9999/;
-				" < defaultXonotic.cfg > defaultXonotic.cfg.new
+				" < xonotic-common.cfg > xonotic-common.cfg.new
 			else
 				# >= 1.0
 				verbose sed "
 					s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;
 					s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/;
 					s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/;
-				" < defaultXonotic.cfg > defaultXonotic.cfg.new
+				" < xonotic-common.cfg > xonotic-common.cfg.new
 			fi
-			mv defaultXonotic.cfg.new defaultXonotic.cfg
+			mv xonotic-common.cfg.new xonotic-common.cfg
 			case "$RELEASETYPE" in
 				release)
-					echo "" >> defaultXonotic.cfg
-					echo "// nicer menu" >> defaultXonotic.cfg
-					echo "set menu_watermark \"\"" >> defaultXonotic.cfg
+					echo "" >> xonotic-common.cfg
+					echo "// nicer menu" >> xonotic-common.cfg
+					echo "set menu_watermark \"\"" >> xonotic-common.cfg
 					;;
 			esac
 			(
diff --git a/release.cmake b/release.cmake
index 124d7d7b..44b16eb8 100644
--- a/release.cmake
+++ b/release.cmake
@@ -9,9 +9,9 @@ add_custom_target(release)
 string(TIMESTAMP stamp "%Y%m%d")
 string(TIMESTAMP filestamp "%Y-%m-%d")
 
-file(STRINGS data/xonotic-data.pk3dir/defaultXonotic.cfg _contents REGEX "^gameversion ")
+file(STRINGS data/xonotic-data.pk3dir/xonotic-common.cfg _contents REGEX "^gameversion ")
 if (NOT _contents)
-    message(FATAL_ERROR "defaultXonotic.cfg does not contain gameversion")
+    message(FATAL_ERROR "xonotic-common.cfg does not contain gameversion")
 else ()
     string(REGEX REPLACE ".*gameversion ([0-9]+).*" "\\1" versionstr "${_contents}")
     math(EXPR versionstr_major "${versionstr} / 10000")
diff --git a/server/server.cfg b/server/server.cfg
index 6545820b..afa52ecc 100644
--- a/server/server.cfg
+++ b/server/server.cfg
@@ -193,7 +193,7 @@ sv_weaponstats_file http://www.xonotic.org/weaponbalance/
 /////////////////////////////////////////////////////////////////////
 // Overkill mod settings
 
-// To enable Overkill, put 'exec defaultOverkill.cfg' at the top of this file (above any other cvar changes), don't use 'g_overkill 1' directly.
+// To enable Overkill, put 'exec ruleset-overkill.cfg' at the top of this file (above any other cvar changes), don't use 'g_overkill 1' directly.
 // You should also consider enabling 'g_fullbrightplayers 1'.