X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=bin%2Fsrsync-incremental;h=685505884b871b1a9795b4cac06e63893c0f9275;hb=6d1261a71e922cf346a557dde95ce531f8b7bcbc;hp=909c028802032b5679321c7dcc53e0a83518c1a2;hpb=eb6bc786f279dce74d397ae59639fc14b7a98d5c;p=config%2Fdotfiles.git
diff --git a/bin/srsync-incremental b/bin/srsync-incremental
index 909c028..6855058 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-2016 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,31 @@ if test "$#" -lt 2; then
fi
-cd "$1" || exit 1
+cd "$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
-
-target=backup-`date '+%Y-%m-%d-%H-%M-%S'`
+# Get path to last backup directory.
+dest=./
+for x in backup-*; do
+ test -d "$x" || continue
+ dest="../$x" # relative to destination directory
+done
-if test -d current; then
- echo "Target directory 'current' already exists, aborting." >&2
- exit 1
-fi
+target="backup-$(date '+%Y-%m-%d-%H-%M-%S')"
+target_tmp="partial-$target"
-mkdir current
+mkdir "$target_tmp"
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"
+ "$@" "$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
+}
+mv "$target_tmp" "$target"