Avoid changing solidity state of entcs_sender entities too; it fixes #2225

[xonotic/xonotic-data.pk3dir.git] / tx.sh

diff --git a/tx.sh b/tx.sh
index 19568c991e826c196db8714bcf25ed9b9bbcc358..271f1cc75a82f1dbfbe48cbddd75a1c363fc8547 100644 (file)
--- a/tx.sh
+++ b/tx.sh
@@ -54,29 +54,31 @@ if $sync_po; then
                gnewfile=common.$lang.po
                if [ -f "$tcurfile" ]; then
                        git show "$mergebase":"$gnewfile" > "$goldfile"
-                       msgmerge -F -U "$tcurfile" common.pot
-                       msgmerge -F -U "$goldfile" common.pot
-                       msgmerge -F -U "$gnewfile" common.pot
+                       msgmerge -N -F -U "$tcurfile" common.pot
+                       msgmerge -N -F -U "$goldfile" common.pot
+                       msgmerge -N -F -U "$gnewfile" common.pot
                        if diff -u "$goldfile" "$gnewfile" >/dev/null; then
                                # no change on git, changed on tx only
-                               msgmerge -F -U "$tcurfile" common.pot
+                               msgmerge -N -F -U "$tcurfile" common.pot
                                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 -F -U "$tcurfile" common.pot
+                               msgmerge -N -F -U "$tcurfile" common.pot
                                cp "$tcurfile" "$gnewfile"
                        fi
                        rm "$goldfile"
                else
-                       msgmerge -F -U "$gnewfile" common.pot
+                       msgmerge -N -F -U "$gnewfile" common.pot
                        cp "$gnewfile" "$tcurfile"
                fi
        done