Unwrap po files before using diff on them.
This commit is contained in:
parent
4595fbc7f6
commit
91c63a5756
7
pack
7
pack
|
@ -42,9 +42,10 @@ for BRANCH in $TRUNK $BRANCHES; do
|
||||||
bfile=`basename $file`
|
bfile=`basename $file`
|
||||||
echo -n "Processing catalog $bfile... ";
|
echo -n "Processing catalog $bfile... ";
|
||||||
d=`echo "$bfile" | sed "s/.$LCODE.po//"`
|
d=`echo "$bfile" | sed "s/.$LCODE.po//"`
|
||||||
$MSGMERGE --silent $file -U $file
|
$MSGMERGE --no-wrap --silent $file $file -o $file.temp
|
||||||
if [ -f "$BRANCH/$d/$LCODE.po" ]; then
|
if [ -f "$BRANCH/$d/$LCODE.po" ]; then
|
||||||
if ! $DIFF -q "$file" "$BRANCH/$d/$LCODE.po" > /dev/null ; then
|
$MSGMERGE --no-wrap --silent "$BRANCH/$d/$LCODE.po" "$BRANCH/$d/$LCODE.po" -o "$BRANCH/$d/$LCODE.po.temp"
|
||||||
|
if ! $DIFF -q "$file.temp" "$BRANCH/$d/$LCODE.po.temp" > /dev/null ; then
|
||||||
mkdir "$LCODE-temp/$d"
|
mkdir "$LCODE-temp/$d"
|
||||||
cp "$file" "$LCODE-temp/$d/$LCODE.po"
|
cp "$file" "$LCODE-temp/$d/$LCODE.po"
|
||||||
echo -e $GREEN"OK"$ENDCOLOR
|
echo -e $GREEN"OK"$ENDCOLOR
|
||||||
|
@ -52,6 +53,8 @@ for BRANCH in $TRUNK $BRANCHES; do
|
||||||
else
|
else
|
||||||
echo -e $BLUE"Skipping"$ENDCOLOR
|
echo -e $BLUE"Skipping"$ENDCOLOR
|
||||||
fi
|
fi
|
||||||
|
rm $file.temp
|
||||||
|
rm "$BRANCH/$d/$LCODE.po.temp"
|
||||||
else
|
else
|
||||||
mkdir -p "$LCODE-temp/$d"
|
mkdir -p "$LCODE-temp/$d"
|
||||||
cp "$file" "$LCODE-temp/$d/$LCODE.po"
|
cp "$file" "$LCODE-temp/$d/$LCODE.po"
|
||||||
|
|
Loading…
Reference in New Issue