X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=check-cvars.sh;h=387d93720392d660fccf6b43b8dd9ca37c05a0ad;hb=cc7bbb72a133063d00a1bdf75ae5d3855b68f353;hp=43683feb8270802ad0c5abb52fa30356eeab4b16;hpb=ee5353529c2fee304ac944aa19af53cc85eca7b0;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/check-cvars.sh b/check-cvars.sh index 43683feb8..387d93720 100755 --- a/check-cvars.sh +++ b/check-cvars.sh @@ -6,16 +6,20 @@ check_files() { countw=`awk ''"$3"' { print $2; }' "$1" | sort -u | tr -d '\r' | git hash-object --stdin | cut -c 1-32` for b in $2; do + if [ "$b" = "balance-testing.cfg" ] || [ "$b" = "balance-testingxpm.cfg" ]; then + continue + fi + countb=`awk ''"$3"' { print $2; }' "$b" | sort -u | tr -d '\r' | git hash-object --stdin | cut -c 1-32` if [ "$countw" != "$countb" ]; then - echo "Mismatch between "$1" and $b. Aborting." + echo "Mismatch between $1 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 ''"$3"' { print $2; }' "$1" | sort -u | tr -d '\r' > "$A" - awk ''"$3"' { print $2; }' "$b" | sort -u | tr -d '\r' > "$B" + awk ''"$3"' { print $2; }' "$1" | sort -u | tr -d '\r' > "$A" + awk ''"$3"' { print $2; }' "$b" | sort -u | tr -d '\r' > "$B" diff "$A" "$B" | grep '^[<>]' | sort rm -f "$A" "$B" errord=true @@ -24,6 +28,7 @@ check_files() } check_files "balance-xonotic.cfg" "balance-*.cfg" "/^seta? g_/" +check_files "bal-wep-xonotic.cfg" "bal-wep-*.cfg" "/^seta? g_/" check_files "_hud_descriptions.cfg" "hud_*.cfg" "/^seta? hud_/" if $errord; then