X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=bin%2Fsrsync-incremental;h=909c028802032b5679321c7dcc53e0a83518c1a2;hb=9b975c15a2b8ab40b76e4f3922b43df1ec2c149c;hp=a76bf728ec76992f06b2576500ae61494ccda9d3;hpb=94961a22c468a56a53158dea7b68ebdbe6b9ac06;p=config%2Fdotfiles.git

diff --git a/bin/srsync-incremental b/bin/srsync-incremental
index a76bf72..909c028 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,31 +21,35 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-if [ $# -lt 2 ]; then
+set -e
+
+if test "$#" -lt 2; then
     echo "Usage: $0 <backups-directory> <arguments to rsync>" >&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
-    dest="`pwd`/`ls -1d backup-* | tail -n1`"
+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'`
 
-if [ -d current ]; then
+if test -d current; then
     echo "Target directory 'current' already exists, aborting." >&2
     exit 1
 fi
 
 mkdir current
 rsync \
-    --verbose --human-readable \
+    --verbose --itemize-changes --human-readable \
     --archive --hard-links --numeric-ids --one-file-system \
     --link-dest="$dest" \
     "$@" current \