Merge lp:~sil2100/langpack-o-matic/multi_merge into lp:langpack-o-matic

[Łukasz Zemczak]

Modify the merge-tarballs to merge in multiple tarballs together, not limited to 2. This is useful for cases such as ubuntu-touch 15.04 series where we need to merge vivid full, vivid delta and the overlay.

Modify the merge-tarballs to merge in multiple tarballs together, not limited to 2. This is useful for cases such as ubuntu-touch 15.04 series where we need to merge vivid full, vivid delta and the overlay.

[Martin Pitt (pitti)]

Some nits wrt. the temp dir cleanup. Thanks!

review: Needs Fixing

[lp:~sil2100/langpack-o-matic/multi_merge]

546. By Łukasz Zemczak on 2015-09-22

Try to deal with the issues rised by Martin

547. By Łukasz Zemczak on 2015-09-22

Fix indent

[Łukasz Zemczak (sil2100)]

How about something like this for now?

[Martin Pitt (pitti)]

OK, thanks. I still hate that code (it's massively inefficient and hard to understand -- not your fault, but mine back then), but let's unblock this for now.

review: Approve

=== modified file 'merge-tarballs'
--- merge-tarballs	2011-07-21 13:08:42 +0000
+++ merge-tarballs	2015-09-22 16:18:04 +0000
@@ -2,45 +2,61 @@
 
 # this is part of langpack-o-matic, by Martin Pitt <[e-mail]>
 #
-# (C) 2005 Canonical Ltd.
+# (C) 2005-2015 Canonical Ltd.
 #
-# Merge two translation tarballs.
+# Merge multiple translation tarballs.
 
-[ "$1" -a "$2" -a "$3" ] || {
-    echo "Usage: $0 <input tarball 1> <input tarball 2> <output tarball>"  >&2
+[ $# -lt 3 ] && {
+    echo "Usage: $0 <input tarball 1> <input tarball 2> ... <input tarball n> <output tarball>" >&2
     exit 1
 }
 
-T1=$(mktemp -d)
-T2=$(mktemp -d)
-
-trap "rm -rf $T1 $T2" 0 1 2 3 13 15
-
-tar -C $T1 -xz < "$1"
-tar -C $T2 -xz < "$2"
-
-TOP1="$T1/$(ls "$T1")"
-TOP2="$T2/$(ls "$T2")"
-
-if echo "$3" | grep -q '^/'; then
+TD=$(mktemp -d)
+# initial trap for script interruption
+trap "rm -rf $TD" 0 1 2 3 13 15
+
+# extract the first tarball - all others will be merged sequentially into that one
+tar -C $TD -xz < "$1"
+shift 1
+TOPD="$TD/$(ls "$TD")"
+cp "$TOPD/mapping.txt" "$TOPD/mapping.txt.merged"
+MAIN=`pwd`
+
+TS=$(mktemp -d)
+trap "rm -rf $TD $TS" 0 1 2 3 13 15
+
+while [ "$#" != "1" ]; do
+    tar -C $TS -xz < "$1"
+    TOPS="$TS/$(ls "$TS")"
+
+    # copy PO and POT files
+    cd "$TOPS"
+    find \( -name "*.po" -o -name "*.pot" \) -exec install -D -m 644 '{}' "$TOPD/{}" \;
+
+    # timestamp
+    cp "$TOPS/timestamp.txt" "$TOPD"
+
+    # append domain maps
+    cat "$TOPS/mapping.txt" >> "$TOPD/mapping.txt"
+
+    shift 1
+    cd $MAIN
+    rm -rf $TS/*
+done
+
+# merge the domain maps
+sort -u "$TOPD/mapping.txt.merged" > "$TOPD/mapping.txt"
+
+rmdir $TS
+
+if echo "$1" | grep -q '^/'; then
     # absolute path
-    OUT="$3"
+    OUT="$1"
 else
     # relative path
-    OUT="$(pwd)/$3"
+    OUT="$(pwd)/$1"
 fi
 
-# copy PO and POT files
-cd "$TOP2"
-find \( -name "*.po" -o -name "*.pot" \) -exec install -D -m 644 '{}' "$TOP1/{}" \;
-
-# timestamp
-cp "$TOP2/timestamp.txt" "$TOP1"
-
-# merge domain maps
-cat "$TOP1/mapping.txt" "$TOP2/mapping.txt" | sort -u > "$TOP1/mapping.txt.merged"
-mv "$TOP1/mapping.txt.merged" "$TOP1/mapping.txt"
-
-# create new tarball
-cd "$T1"
+cd "$TD"
 tar c . | gzip -9 > "$OUT"
+