X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=tx.sh;h=271f1cc75a82f1dbfbe48cbddd75a1c363fc8547;hb=1f775293e229ce85340e3b6aefb863e6afee14cd;hp=c2e9f3a5f5d00a5e41bbccd9db190182f785d70f;hpb=343a058d7b1c5e28dda77ab5c6493a367400876e;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/tx.sh b/tx.sh index c2e9f3a5f..271f1cc75 100644 --- a/tx.sh +++ b/tx.sh @@ -63,13 +63,15 @@ if $sync_po; then cp "$tcurfile" "$gnewfile" else if ! diff -u "$goldfile" "$gnewfile" | patch "$tcurfile"; then - while :; do - vim -o "$tcurfile.rej" "$tcurfile" - echo "OK?" - read -r OK || exit 1 - [ x"$OK" != x"y" ] || break - done - rm -f "$tcurfile.rej" + if [ -z "$BATCH" ]; then + while :; do + vim -o "$tcurfile.rej" "$tcurfile" + echo "OK?" + read -r OK || exit 1 + [ x"$OK" != x"y" ] || break + done + rm -f "$tcurfile.rej" + fi fi msgmerge -N -F -U "$tcurfile" common.pot cp "$tcurfile" "$gnewfile"