X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=bin%2Fsrsync-incremental;h=7fe898aa5d058ff46ac7e03fc97e01f8f585f586;hb=8f24a1138ad378038239e8d0cb9619864f7ca026;hp=909c028802032b5679321c7dcc53e0a83518c1a2;hpb=eb6bc786f279dce74d397ae59639fc14b7a98d5c;p=config%2Fdotfiles.git

diff --git a/bin/srsync-incremental b/bin/srsync-incremental
index 909c028..7fe898a 100755
--- a/bin/srsync-incremental
+++ b/bin/srsync-incremental
@@ -5,7 +5,7 @@
 # Thanks to http://www.sanitarium.net/golug/rsync_backups_2010.html for the
 # idea.
 
-# Copyright (C) 2011-2013  Simon Ruderich
+# Copyright (C) 2011-2014  Simon Ruderich
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -34,11 +34,11 @@ fi
 cd "$1" || exit 1
 shift
 
-dest=`echo backup-*`
-if test "x$dest" != 'xbackup-*'; then
-    # -F and grep is used to list only directories, zsh's *(/) would be great.
-    dest="`pwd`/`ls -1dF backup-* | grep / | tail -n1`"
-fi
+# Get absolute path to last backup directory.
+for x in backup-*; do
+    test -d "$x" || continue
+    dest="../$x" # relative to destination directory
+done
 
 target=backup-`date '+%Y-%m-%d-%H-%M-%S'`
 
@@ -50,7 +50,15 @@ fi
 mkdir current
 rsync \
     --verbose --itemize-changes --human-readable \
-    --archive --hard-links --numeric-ids --one-file-system \
+    --archive --hard-links --sparse --numeric-ids --one-file-system \
     --link-dest="$dest" \
     "$@" current \
-&& mv current "$target"
+|| {
+    # Try to remove "current" without changing the exit code. In case the
+    # connection failed without transferring any files, we want the next
+    # backup to be able to run.
+    code=$?
+    rmdir current 2>/dev/null || true
+    exit $code
+}
+mv current "$target"