X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fimport-rdiff-backup-cmd.sh;h=bd324029db748d37208d4287baaa8c32c5e2a156;hb=093752b42c5548028c6f84c67f7741b2321c512f;hp=b86404df481daa6475f833561003226b1ac4833e;hpb=56db423eadcf2f57ef0af2523010a1748ac4fbae;p=bup.git

diff --git a/cmd/import-rdiff-backup-cmd.sh b/cmd/import-rdiff-backup-cmd.sh
index b86404d..bd32402 100755
--- a/cmd/import-rdiff-backup-cmd.sh
+++ b/cmd/import-rdiff-backup-cmd.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+cmd_dir="$(cd "$(dirname "$0")" && pwd)" || exit $?
+
 set -o pipefail
 
 must() {
@@ -35,7 +37,7 @@ done
 
 bup()
 {
-    $dry_run "${BUP_MAIN_EXE:=bup}" "$@"
+    $dry_run "$cmd_dir/bup" "$@"
 }
 
 snapshot_root="$1"
@@ -55,9 +57,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
 
@@ -66,7 +68,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"