From 15329de6033f5fc054a10d41277ce6ed69925edc Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Tue, 2 May 2017 21:14:22 +0000 Subject: Changed order of error/warning handling to avoid redundant error messages. Displayed grep command that can be copied and pasted to investigate backup issues. --- rsync_tmbackup.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/rsync_tmbackup.sh b/rsync_tmbackup.sh index fe589cc..24170b8 100755 --- a/rsync_tmbackup.sh +++ b/rsync_tmbackup.sh @@ -406,14 +406,15 @@ while : ; do # Check whether rsync reported any errors # ----------------------------------------------------------------------------- - if [ -n "$(grep "rsync:" "$LOG_FILE")" ]; then - fn_log_warn "Rsync reported a warning, please check '$LOG_FILE' for more details." - fi if [ -n "$(grep "rsync error:" "$LOG_FILE")" ]; then - fn_log_error "Rsync reported an error, please check '$LOG_FILE' for more details." + fn_log_error "Rsync reported an error. Run this command for more details: grep -E 'rsync:|rsync error:' '$LOG_FILE'" exit 1 fi + if [ -n "$(grep "rsync:" "$LOG_FILE")" ]; then + fn_log_warn "Rsync reported a warning. Run this command for more details: grep -E 'rsync:|rsync error:' '$LOG_FILE'" + fi + # ----------------------------------------------------------------------------- # Add symlink to last successful backup # ----------------------------------------------------------------------------- -- cgit v1.2.3