X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=bin%2Fsrsync-incremental;h=187e6b6d84a165109c218c2f2b3526f14665947f;hb=0627246aa2b5db1320965061e517f65742be9d19;hp=16aa88a0215f3db4cb4d231bc212bbf3bd783135;hpb=8f71f32aa3e89e59258a90b93c79a7280397e8c5;p=config%2Fdotfiles.git
diff --git a/bin/srsync-incremental b/bin/srsync-incremental
index 16aa88a..187e6b6 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-2017 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 .
-set -e
+set -eu
if test "$#" -lt 2; then
echo "Usage: $0 " >&2
@@ -31,26 +31,36 @@ if test "$#" -lt 2; then
fi
-cd "$1" || exit 1
+cd "$1"
shift
-# Get absolute path to last backup directory.
+# Get path to last backup directory.
+dest=./
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'`
+target="backup-$(date '+%Y-%m-%d-%H-%M-%S')"
+target_tmp="partial-$target"
-if test -d current; then
- echo "Target directory 'current' already exists, aborting." >&2
- exit 1
-fi
-
-mkdir current
+mkdir "$target_tmp"
rsync \
--verbose --itemize-changes --human-readable \
- --archive --hard-links --numeric-ids --one-file-system \
+ --archive --acls --xattrs --hard-links --sparse --numeric-ids \
+ --one-file-system \
--link-dest="$dest" \
- "$@" current \
-&& mv current "$target"
+ "$@" "$target_tmp" \
+|| {
+ # Try to remove the target directory without changing the exit code. In
+ # case the connection failed without transferring any files, we want to
+ # remove the empty directory.
+ code=$?
+ rmdir "$target_tmp" 2>/dev/null || true
+ exit $code
+}
+# --dry-run (-n) creates an empty directory. Remove it to prevent using it for
+# further incremental backups (which would do a full backup).
+rmdir "$target_tmp" 2>/dev/null && exit 0 || true
+
+mv "$target_tmp" "$target"