Merge remote branch 'origin/fruitiex/fruitbalance'

[xonotic/xonotic-data.pk3dir.git] / update-cvarcount.sh

diff --git a/update-cvarcount.sh b/update-cvarcount.sh
index 801314a6d82121f00f33e0766e0e4dd2ef78d2a8..b82840ae0873fcf9fc38d3a7c71330199338df2e 100755 (executable)
--- 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:"
+               A=`mktemp`
+               B=`mktemp`
+               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"
+               echo "< missing in $b"
+               echo "> must get removed from $b"
+               diff "$A" "$B" | grep '^[<>]' | sort
+               rm -f "$A" "$B"
                exit 1
        fi
 done