X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=bin%2Fsrsync-incremental;h=16aa88a0215f3db4cb4d231bc212bbf3bd783135;hb=8f71f32aa3e89e59258a90b93c79a7280397e8c5;hp=aa2c977c056a2898c7ad0c7ac90acd947c6c202f;hpb=71bd44e6c82a82f3f0ca868c93217f6c522b5d22;p=config%2Fdotfiles.git
diff --git a/bin/srsync-incremental b/bin/srsync-incremental
index aa2c977..16aa88a 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-2012 Simon Ruderich
+# Copyright (C) 2011-2013 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,25 +21,28 @@
# along with this program. If not, see .
-if [ $# -lt 2 ]; then
+set -e
+
+if test "$#" -lt 2; then
echo "Usage: $0 " >&2
echo
echo "Note: The target directory is the _first_ argument!" >&2
exit 2
fi
+
cd "$1" || exit 1
shift
-dest=`echo backup-*`
-if [ "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'`
-if [ -d current ]; then
+if test -d current; then
echo "Target directory 'current' already exists, aborting." >&2
exit 1
fi