X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=check-cvars.sh;h=387d93720392d660fccf6b43b8dd9ca37c05a0ad;hb=cb1bf443709836b6decad82a41bed204776609a5;hp=8525385d98ba3e2b5d6a1638d1168f98e5800ce7;hpb=32e640c7f14f73ca5555fc95b725b5cdc99bb348;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/check-cvars.sh b/check-cvars.sh index 8525385d9..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