zsh/rc: fix `reset` with zsh-internal colored stderr hack

[config/dotfiles.git] / bin / srsync-incremental

diff --git a/bin/srsync-incremental b/bin/srsync-incremental
index 685505884b871b1a9795b4cac06e63893c0f9275..187e6b6d84a165109c218c2f2b3526f14665947f 100755 (executable)
--- 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-2016  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
@@ -47,7 +47,8 @@ target_tmp="partial-$target"
 mkdir "$target_tmp"
 rsync \
     --verbose --itemize-changes --human-readable \
-    --archive --hard-links --sparse --numeric-ids --one-file-system \
+    --archive --acls --xattrs --hard-links --sparse --numeric-ids \
+    --one-file-system \
     --link-dest="$dest" \
     "$@" "$target_tmp" \
 || {
@@ -58,4 +59,8 @@ rsync \
     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"