X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=bin%2Fsrsync-incremental;h=0ae1e56c208e562b839628862e11ab32bb2fcc19;hb=4f7b2f8b413a236e0e310cfa8f4c7e05cca30ec8;hp=16aa88a0215f3db4cb4d231bc212bbf3bd783135;hpb=8f71f32aa3e89e59258a90b93c79a7280397e8c5;p=config%2Fdotfiles.git

diff --git a/bin/srsync-incremental b/bin/srsync-incremental
index 16aa88a..0ae1e56 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
@@ -21,7 +21,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-set -e
+set -eu
 
 if test "$#" -lt 2; then
     echo "Usage: $0 <backups-directory> <arguments to rsync>" >&2
@@ -31,7 +31,7 @@ if test "$#" -lt 2; then
 fi
 
 
-cd "$1" || exit 1
+cd "$1"
 shift
 
 # Get absolute path to last backup directory.
@@ -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"