From cbd9166454c2b62191ff62d55d1ded0a45ff80fa Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Sat, 26 Sep 2009 12:36:04 +0000
Subject: [PATCH] make balanceSamual.cfg cvar-checked too

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7921 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/balanceSamual.cfg   | 10 +++++++---
 data/update-cvarcount.sh | 25 ++++++++++++-------------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/data/balanceSamual.cfg b/data/balanceSamual.cfg
index cb081b709..500e07c13 100644
--- a/data/balanceSamual.cfg
+++ b/data/balanceSamual.cfg
@@ -1,6 +1,10 @@
-// {{{ weapon replacement
-// NOTE: this only replaces weapons on the map
-// use g_start_weapon_* to also replace the on-startup weapons!
+// NOTE: whenever you add a cvar to this file, run update-cvarcount.sh to
+// update this checksum!
+//
+// And... don't forget to edit the other balance*.cfg too.
+
+set cvar_check_balance 59ee376a58dfcc2e2ee440c6a9508e11
+
 // {{{ weapon replacement
 // NOTE: this only replaces weapons on the map
 // use g_start_weapon_* to also replace the on-startup weapons!
diff --git a/data/update-cvarcount.sh b/data/update-cvarcount.sh
index 41edddb6c..6bddb3a24 100755
--- a/data/update-cvarcount.sh
+++ b/data/update-cvarcount.sh
@@ -1,23 +1,22 @@
 #!/bin/sh
 
+balance_cfgs="balanceHavoc.cfg balance25.cfg balanceSamual.cfg"
+
 countd=`awk '/^seta? g_/ { print $2; }' defaultNexuiz.cfg | sort -u | tr -d '\r' | md5sum | cut -c 1-32`
 countw=`awk '/^seta? g_/ { print $2; }' balance.cfg       | sort -u | tr -d '\r' | md5sum | cut -c 1-32`
-counth=`awk '/^seta? g_/ { print $2; }' balanceHavoc.cfg  | sort -u | tr -d '\r' | md5sum | cut -c 1-32`
-countl=`awk '/^seta? g_/ { print $2; }' balance25.cfg     | sort -u | tr -d '\r' | md5sum | cut -c 1-32`
-
-if [ "$countw" != "$counth" ]; then
-	echo "Mismatch between balance.cfg and balanceHavoc.cfg. Aborting."
-	exit 1
-fi
-if [ "$countw" != "$countl" ]; then
-	echo "Mismatch between balance.cfg and balanceHavoc.cfg. Aborting."
-	exit 1
-fi
+for b in $balance_cfgs; do
+	countb=`awk '/^seta? g_/ { print $2; }' "$b"  | sort -u | tr -d '\r' | md5sum | cut -c 1-32`
+	if [ "$countw" != "$countb" ]; then
+		echo "Mismatch between balance.cfg and $b. Aborting."
+		exit 1
+	fi
+done
 
 sed -i -e "s/^set cvar_check_default .*/set cvar_check_default $countd/" defaultNexuiz.cfg
 sed -i -e "s/^set cvar_check_balance .*/set cvar_check_balance $countw/" balance.cfg
-sed -i -e "s/^set cvar_check_balance .*/set cvar_check_balance $countw/" balanceHavoc.cfg
-sed -i -e "s/^set cvar_check_balance .*/set cvar_check_balance $countw/" balance25.cfg
+for b in $balance_cfgs; do
+	sed -i -e "s/^set cvar_check_balance .*/set cvar_check_balance $countw/" "$b"
+done
 
 sed -e "
 	s/^string CVAR_CHECK_DEFAULT = .*/string CVAR_CHECK_DEFAULT = \"$countd\";/;
-- 
2.39.2