X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fimport-rsnapshot-cmd.sh;h=91f711e19e10f817d83a38f1eb2fc990ebe23f36;hb=053869284db064aa21b2249981ec6affa489e296;hp=d594c31d969d19117c3529594ff74405848f152c;hpb=6f6a1111ea20316499ad748a1cb118ec5d5c117f;p=bup.git

diff --git a/cmd/import-rsnapshot-cmd.sh b/cmd/import-rsnapshot-cmd.sh
index d594c31..91f711e 100755
--- a/cmd/import-rsnapshot-cmd.sh
+++ b/cmd/import-rsnapshot-cmd.sh
@@ -1,11 +1,13 @@
 #!/bin/sh
 # Does an import of a rsnapshot archive.
 
+cmd_dir="$(cd "$(dirname "$0")" && pwd)" || exit $?
+
 usage() {
     echo "Usage: bup import-rsnapshot [-n]" \
         "<path to snapshot_root> [<backuptarget>]"
     echo "-n,--dry-run: just print what would be done"
-    exit -1
+    exit 1
 }
 
 DRY_RUN=
@@ -16,7 +18,7 @@ done
 
 bup()
 {
-    $DRY_RUN "${BUP_MAIN_EXE:=bup}" "$@"
+    $DRY_RUN "$cmd_dir/bup" "$@"
 }
 
 SNAPSHOT_ROOT=$1
@@ -36,7 +38,7 @@ for SNAPSHOT in *; do
     [ -e "$SNAPSHOT/." ] || continue
     echo "snapshot='$SNAPSHOT'" >&2
     for BRANCH_PATH in "$SNAPSHOT/"*; do
-        BRANCH=$(basename "$BRANCH_PATH")
+        BRANCH=$(basename "$BRANCH_PATH") || exit $?
         [ -e "$BRANCH_PATH/." ] || continue
         [ -z "$TARGET" -o "$TARGET" = "$BRANCH" ] || continue
         
@@ -48,10 +50,10 @@ for SNAPSHOT in *; do
 	[ -n "$DATE" ] || exit 3
 
         TMPIDX=bupindex.$BRANCH.tmp
-        bup index -ux -f "$TMPIDX" "$BRANCH_PATH/"
+        bup index -ux -f "$TMPIDX" "$BRANCH_PATH/" || exit $?
         bup save --strip --date="$DATE" \
-                -f "$TMPIDX" -n "$BRANCH" \
-                "$BRANCH_PATH/"
-        rm -f "$TMPIDX"
+            -f "$TMPIDX" -n "$BRANCH" \
+            "$BRANCH_PATH/" || exit $?
+        rm "$TMPIDX" || exit $?
     done
 done