X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=update-cvarcount.sh;h=b7c87a34a63ff22494dbecbb418dc9fd25cd7d74;hp=539c0c1df1df5efba5ed86592053039633f3b84a;hb=2f4f917422b1fd7994b5332b100ea7d776dcbf74;hpb=b42a2b0a6c12ccbb208bd8cafb0a8405adbc3ae0 diff --git a/update-cvarcount.sh b/update-cvarcount.sh index 539c0c1df..b7c87a34a 100755 --- a/update-cvarcount.sh +++ b/update-cvarcount.sh @@ -5,6 +5,16 @@ 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" + echo "Please wait for 30 seconds, so you have had enough time to read this..." + sleep 30 fi done