X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=update-cvarcount.sh;h=b7c87a34a63ff22494dbecbb418dc9fd25cd7d74;hp=801314a6d82121f00f33e0766e0e4dd2ef78d2a8;hb=b1a36f6835f06e4e00971de90ecd2168f04a6ed7;hpb=715202f719f244160bfc0b004013fa6e1bcc5668

diff --git a/update-cvarcount.sh b/update-cvarcount.sh
index 801314a6d..b7c87a34a 100755
--- a/update-cvarcount.sh
+++ b/update-cvarcount.sh
@@ -1,12 +1,20 @@
 #!/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."
-		exit 1
+		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"
+		echo "Please wait for 30 seconds, so you have had enough time to read this..."
+		sleep 30
 	fi
 done