schiwagoa/rsync-time-backup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added --stats --human-readable to default rsync flags, and done minor clean up and refactoring

Browse Source
This commit is contained in:
Laurent Cozic
2017-05-02 21:58:01 +00:00
parent 1ffb922e33
commit 77d8c56000
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rsync_tmbackup.sh
+7 -8
View File
@@ -108,15 +108,15 @@ fn_mkdir() {
} }
fn_rm() { fn_rm() {
fn_run_cmd "mkdir /tmp/rsync-time-backup-emptydir" if [[ -d $1 ]]; then
if [ -d '$1' ] ; then # when deleting a directory use rsync for performance reasons
# when deleting a directory use rsyny for performance reasons fn_run_cmd "mkdir -p /tmp/rsync-time-backup-emptydir"
fn_run_cmd "rsync -a --delete /tmp/rsync-time-backup-emptydir/ '$1'" fn_run_cmd "rsync -a --delete /tmp/rsync-time-backup-emptydir/ '$1'"
elif [ -f '$1' ]; then fn_run_cmd "rm -rf /tmp/rsync-time-backup-emptydir '$1'"
else
# when deleting a file use regular rm # when deleting a file use regular rm
fn_run_cmd "rm -f '$1'" fn_run_cmd "rm -f '$1'"
fi fi
fn_run_cmd "rm -rf /tmp/rsync-time-backup-emptydir '$1'"
} }
fn_touch() { fn_touch() {
@@ -143,7 +143,7 @@ EXCLUSION_FILE=""
LOG_DIR="$HOME/.$APPNAME" LOG_DIR="$HOME/.$APPNAME"
AUTO_DELETE_LOG="1" AUTO_DELETE_LOG="1"
RSYNC_FLAGS="-D --compress --numeric-ids --links --hard-links --one-file-system --itemize-changes --times --recursive --perms --owner --group" RSYNC_FLAGS="-D --compress --numeric-ids --links --hard-links --one-file-system --itemize-changes --times --recursive --perms --owner --group --stats --human-readable"
while :; do while :; do
case $1 in case $1 in
@@ -374,7 +374,6 @@ while : ; do
fi fi
CMD="$CMD $LINK_DEST_OPTION" CMD="$CMD $LINK_DEST_OPTION"
CMD="$CMD -- '$SRC_FOLDER/' '$SSH_FOLDER_PREFIX$DEST/'" CMD="$CMD -- '$SRC_FOLDER/' '$SSH_FOLDER_PREFIX$DEST/'"
CMD="$CMD | grep -E '^deleting|[^/]$'"
fn_log_info "Running command:" fn_log_info "Running command:"
fn_log_info "$CMD" fn_log_info "$CMD"
@@ -387,7 +386,6 @@ while : ; do
# Check if we ran out of space # Check if we ran out of space
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# TODO: find better way to check for out of space condition without parsing log.
NO_SPACE_LEFT="$(grep "No space left on device (28)\|Result too large (34)" "$LOG_FILE")" NO_SPACE_LEFT="$(grep "No space left on device (28)\|Result too large (34)" "$LOG_FILE")"
if [ -n "$NO_SPACE_LEFT" ]; then if [ -n "$NO_SPACE_LEFT" ]; then
@@ -407,6 +405,7 @@ while : ; do
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Check whether rsync reported any errors # Check whether rsync reported any errors
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
if [ -n "$(grep "rsync:" "$LOG_FILE")" ]; then if [ -n "$(grep "rsync:" "$LOG_FILE")" ]; then
fn_log_warn "Rsync reported a warning, please check '$LOG_FILE' for more details." fn_log_warn "Rsync reported a warning, please check '$LOG_FILE' for more details."
fi fi