X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=check-cvars.sh;h=387d93720392d660fccf6b43b8dd9ca37c05a0ad;hp=031613a7bf00ec67744e246e99db6187be8f5399;hb=dad6065d72f70dc5866384050ece0d36b249bf64;hpb=fbb52b893f7be6bf4073f1853761c4f2fc11a343

diff --git a/check-cvars.sh b/check-cvars.sh
index 031613a7b..387d93720 100755
--- a/check-cvars.sh
+++ b/check-cvars.sh
@@ -6,16 +6,20 @@ check_files()
 {
 	countw=`awk ''"$3"' { print $2; }' "$1" | sort -u | tr -d '\r' | git hash-object --stdin | cut -c 1-32`
 	for b in $2; do
+		if [ "$b" = "balance-testing.cfg" ] || [ "$b" = "balance-testingxpm.cfg" ]; then
+			continue
+		fi
+
 		countb=`awk ''"$3"' { print $2; }' "$b" | sort -u | tr -d '\r' | git hash-object --stdin | cut -c 1-32`
 		if [ "$countw" != "$countb" ]; then
-			echo "Mismatch between "$1" and $b. Aborting."
+			echo "Mismatch between $1 and $b. Aborting."
 			echo "Differences are:"
 			echo "< missing in $b"
 			echo "> must get removed from $b"
 			A=`mktemp || echo a.tmp`
 			B=`mktemp || echo b.tmp`
-			awk ''"$3"' { print $2; }' "$1"      | sort -u | tr -d '\r' > "$A"
-			awk ''"$3"' { print $2; }' "$b"                     | sort -u | tr -d '\r' > "$B"
+			awk ''"$3"' { print $2; }' "$1" | sort -u | tr -d '\r' > "$A"
+			awk ''"$3"' { print $2; }' "$b" | sort -u | tr -d '\r' > "$B"
 			diff "$A" "$B" | grep '^[<>]' | sort
 			rm -f "$A" "$B"
 			errord=true
@@ -24,9 +28,13 @@ check_files()
 }
 
 check_files "balance-xonotic.cfg" "balance-*.cfg" "/^seta? g_/"
+check_files "bal-wep-xonotic.cfg" "bal-wep-*.cfg" "/^seta? g_/"
 check_files "_hud_descriptions.cfg" "hud_*.cfg" "/^seta? hud_/"
 
 if $errord; then
+    if [ "$CMAKE" != "" ]; then
+	    exit 1
+	fi
 	echo "Please wait for 30 seconds, so you have had enough time to read this..."
 	sleep 30
 fi