X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=update-cvarcount.sh;h=0024010420e5a06168e479f2e20046db328b3f7c;hb=bb1cdedf8cc1dfaf7cdb66cc7948a778870f17a9;hp=539c0c1df1df5efba5ed86592053039633f3b84a;hpb=0c6fc307c63947463f12d20b1774b714b54d846f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/update-cvarcount.sh b/update-cvarcount.sh
index 539c0c1df..002401042 100755
--- a/update-cvarcount.sh
+++ b/update-cvarcount.sh
@@ -1,10 +1,24 @@
 #!/bin/sh
 
+errord=false
 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 balanceXonotic.cfg and $b. Aborting."
-		exit 1
+		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"
+		errord=true
 	fi
 done
+if $errord; then
+	echo "Please wait for 30 seconds, so you have had enough time to read this..."
+	sleep 30
+fi