From 2e66132717ad7dea5396f4a5691d37c281a834ec Mon Sep 17 00:00:00 2001 From: Christoph Date: Tue, 17 Dec 2024 00:47:08 +0100 Subject: [PATCH] borg2-backup-nc.sh,borg2-backup.sh: some minor changes on message handling. --- borg2-backup-nc.sh | 4 +--- borg2-backup.sh | 6 +----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/borg2-backup-nc.sh b/borg2-backup-nc.sh index c5f90dc..f6c066e 100755 --- a/borg2-backup-nc.sh +++ b/borg2-backup-nc.sh @@ -783,19 +783,17 @@ if [ $error -gt 0 -o $warning -gt 0 ] ; then echo -e -n " Send Error Message to ${ADMIN_EMAIL}.." fi - host_name="$(hostname -f)" err_msg="$(grep -A 2 -i -e"\[\s*ERROR" ${BORG_LOG_FILE})\n" warn_msg="$(grep -A 2 -i -e"\[\s*WARN" ${BORG_LOG_FILE})\n" - msg_top="Borg Backup Error ${COMPANY} vom ${datum}.\nBorg Backup on '${host_name}' beendet mit:" + msg_top="Borg Backup Error ${COMPANY} vom ${datum}.\nBorg Backup on '$(hostname -f)' beendet mit:" msg_body_01="\t${error} Error(s)\n\t${warning} Warning(s)\n" msg_body_02="\n\n--- ERROR(S) ---\n${err_msg}\n\n--- WARNING(S) ...\n${warn_msg}" msg="${msg_top}\n${msg_body_01}\n${msg_body_02}" subject="Borg Backup Errors at ${host_name} -- ${datum}" - #subject="Borg Backup Errors at ${host_name}" subject_utf8="$(echo "${subject}" | iconv -t UTF8)" subject_utf8_encoded="=?utf-8?B?$(echo ${subject_utf8} | base64 --wrap=0)?=" diff --git a/borg2-backup.sh b/borg2-backup.sh index 0296a1a..6499fb4 100755 --- a/borg2-backup.sh +++ b/borg2-backup.sh @@ -752,21 +752,17 @@ if [ $error -gt 0 -o $warning -gt 0 ] ; then echo -e -n " Send Error Message to ${ADMIN_EMAIL}.." fi - #ADMIN_EMAIL="ckubu@oopen.de" - - host_name="$(hostname -f)" err_msg="$(grep -A 2 -i -e"\[\s*ERROR" ${BORG_LOG_FILE})\n" warn_msg="$(grep -A 2 -i -e"\[\s*WARN" ${BORG_LOG_FILE})\n" - msg_top="Borg Backup Error ${COMPANY} vom ${datum}.\nBorg Backup on '${host_name}' beendet mit:" + msg_top="Borg Backup Error ${COMPANY} vom ${datum}.\nBorg Backup on '$(hostname -f)' beendet mit:" msg_body_01="\t${error} Error(s)\n\t${warning} Warning(s)\n" msg_body_02="\n\n--- ERROR(S) ---\n${err_msg}\n\n--- WARNING(S) ...\n${warn_msg}" msg="${msg_top}\n${msg_body_01}\n${msg_body_02}" subject="Borg Backup Errors at ${host_name} -- ${datum}" - #subject="Borg Backup Errors at ${host_name}" subject_utf8="$(echo "${subject}" | iconv -t UTF8)" subject_utf8_encoded="=?utf-8?B?$(echo ${subject_utf8} | base64 --wrap=0)?="