From 98ccd316105dc52469c027bb6e88ece72344fe69 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 3 Apr 2007 16:27:14 +0000 Subject: [PATCH] handle non-existent targets --- rosetta-merge | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 -- 2.30.2