From: Colin Watson <cjwatson@chiark.greenend.org.uk>
Date: Tue, 3 Apr 2007 16:27:14 +0000 (+0000)
Subject: handle non-existent targets
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?p=bin.git;a=commitdiff_plain;h=98ccd316105dc52469c027bb6e88ece72344fe69;hp=1ddf5a972595fcf9b788bb5ef479b36554958ee3

handle non-existent targets
---

diff --git a/rosetta-merge b/rosetta-merge
index 58bb1fa..2e8c1da 100755
--- a/rosetta-merge
+++ b/rosetta-merge
@@ -16,4 +16,14 @@ case $2 in
 esac
 
 [ -e $1/$ROSETTA_LANG.po ] || exit
-msgmerge -q -N <(msgconv -t UTF-8 $1/$ROSETTA_LANG.po | msgattrib --no-obsolete -) *.pot | msgattrib --no-obsolete $MSGATTRIB_OPTS - | msgmerge -q -N - <(msgconv -t UTF-8 $2.po | msgattrib --no-obsolete -) | msgattrib --no-obsolete - | if $APPLY; then sponge $2.po; else diff -u --label $2.po <(msgconv -t UTF-8 $2.po) -; fi
+msgmerge -q -N <(msgconv -t UTF-8 $1/$ROSETTA_LANG.po | msgattrib --no-obsolete -) *.pot | msgattrib --no-obsolete $MSGATTRIB_OPTS - | \
+	if [ -e $2.po ]; then
+		msgmerge -q -N - <(msgconv -t UTF-8 $2.po | msgattrib --no-obsolete -) | msgattrib --no-obsolete -
+	else
+		cat
+	fi | \
+	if $APPLY; then
+		sponge $2.po
+	else
+		diff -u --label $2.po <(msgconv -t UTF-8 $2.po) -
+	fi