Handle commit mergetags (at all)

[bup.git] / cmd / import-rdiff-backup-cmd.sh

diff --git a/cmd/import-rdiff-backup-cmd.sh b/cmd/import-rdiff-backup-cmd.sh
index 98dd21bef765cdcb2e1d8ea17332d7453dcdbe9a..466b6a661ccfa70a74863e2b06e0a3c3fef28ba9 100755 (executable)
--- a/cmd/import-rdiff-backup-cmd.sh
+++ b/cmd/import-rdiff-backup-cmd.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -o pipefail
+
 must() {
     local file=${BASH_SOURCE[0]}
     local line=${BASH_LINENO[0]}
@@ -53,9 +55,9 @@ backups_count=$(echo "$backups" | must wc -l) || exit $?
 counter=1
 echo "$backups" |
 while read timestamp type; do
-    tmpdir=$(must mktemp -d) || exit $?
+    tmpdir=$(must mktemp -d import-rdiff-backup-XXXXXXX) || exit $?
 
-    echo "Importing backup from $(date --date=@$timestamp +%c) " \
+    echo "Importing backup from $(date -d @$timestamp +%c) " \
         "($counter / $backups_count)" 1>&2
     echo 1>&2
 
@@ -64,7 +66,7 @@ while read timestamp type; do
     echo 1>&2
 
     echo "Importing into bup..." 1>&2
-    TMPIDX=$(must mktemp -u) || exit $?
+    TMPIDX=$(must mktemp -u import-rdiff-backup-idx-XXXXXXX) || exit $?
     must bup index -ux -f "$tmpidx" "$tmpdir"
     must bup save --strip --date="$timestamp" -f "$tmpidx" -n "$branch" "$tmpdir"
     must rm -f "$tmpidx"