From: Martin Taibr <taibr.martin@gmail.com>
Date: Wed, 12 Feb 2020 11:19:43 +0000 (+0100)
Subject: fix cvar check "warning"
X-Git-Tag: xonotic-v0.8.5~1132^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6e30b22bda989f83383feb5f25e6badac196c256;p=xonotic%2Fxonotic-data.pk3dir.git

fix cvar check "warning"
---

diff --git a/check-cvars.sh b/check-cvars.sh
index 43683feb8..7366f0cbb 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