X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=update-cvarcount.sh;h=0bd63e9fb2ad9d57e61582ddf0d691cff8a5f831;hb=959b066c86d4cb5c84d70ffb32630b864ba9cbdc;hp=801314a6d82121f00f33e0766e0e4dd2ef78d2a8;hpb=ef9bfcdcd03b5982f6309c4aab02ca2f896daa89;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/update-cvarcount.sh b/update-cvarcount.sh
index 801314a6d..0bd63e9fb 100755
--- a/update-cvarcount.sh
+++ b/update-cvarcount.sh
@@ -1,12 +1,19 @@
 #!/bin/sh
 
-balance_cfgs="balance25.cfg balanceSamual.cfg balanceXPM.cfg"
-
-countw=`awk '/^seta? g_/ { print $2; }' balance.cfg       | sort -u | tr -d '\r' | md5sum | cut -c 1-32`
-for b in $balance_cfgs; do
-	countb=`awk '/^seta? g_/ { print $2; }' "$b"  | sort -u | tr -d '\r' | md5sum | cut -c 1-32`
+countw=`awk '/^seta? g_/ { print $2; }' balanceXonotic.cfg       | sort -u | tr -d '\r' | git hash-object --stdin | cut -c 1-32`
+for b in balance*.cfg; do
+	countb=`awk '/^seta? g_/ { print $2; }' "$b"  | sort -u | tr -d '\r' | git hash-object --stdin | cut -c 1-32`
 	if [ "$countw" != "$countb" ]; then
-		echo "Mismatch between balance.cfg and $b. Aborting."
+		echo "Mismatch between balanceXonotic.cfg 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 '/^seta? g_/ { print $2; }' balanceXonotic.cfg       | sort -u | tr -d '\r' > "$A"
+		awk '/^seta? g_/ { print $2; }' "$b"                     | sort -u | tr -d '\r' > "$B"
+		diff "$A" "$B" | grep '^[<>]' | sort
+		rm -f "$A" "$B"
 		exit 1
 	fi
 done