Merge branch 'master' into mirceakitsune/damage_effects

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

diff --git a/update-cvarcount.sh b/update-cvarcount.sh
index 0bd63e9fb2ad9d57e61582ddf0d691cff8a5f831..0024010420e5a06168e479f2e20046db328b3f7c 100755 (executable)
--- a/update-cvarcount.sh
+++ b/update-cvarcount.sh
@@ -1,5 +1,6 @@
 #!/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`
@@ -14,6 +15,10 @@ for b in balance*.cfg; do
                awk '/^seta? g_/ { print $2; }' "$b"                     | sort -u | tr -d '\r' > "$B"
                diff "$A" "$B" | grep '^[<>]' | sort
                rm -f "$A" "$B"
-               exit 1
+               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