From f3f4ddcd8927bd21296860902e1c9818be0f8dfe Mon Sep 17 00:00:00 2001
From: zertrin <zertrin@gmail.com>
Date: Mon, 28 Mar 2016 23:46:40 +0200
Subject: [PATCH] rework code for email and notifications (more DRY)

---
 duplicity-backup.sh | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/duplicity-backup.sh b/duplicity-backup.sh
index cc28ebb..ef7aa12 100755
--- a/duplicity-backup.sh
+++ b/duplicity-backup.sh
@@ -858,34 +858,24 @@ esac
 
 echo -e "---------    END DUPLICITY-BACKUP SCRIPT    ---------\n" >> "${LOGFILE}"
 
-if [ "${EMAIL_FAILURE_ONLY}" = "yes" ]; then
-  if [ ${BACKUP_ERROR} ]; then
-    EMAIL_SUBJECT="BACKUP ERROR: ${EMAIL_SUBJECT}"
-    email_logfile
-  fi
+# send email
+if [ "${BACKUP_ERROR}" ]; then
+  EMAIL_SUBJECT="BACKUP ERROR: ${EMAIL_SUBJECT}"
 else
-  if [ ${BACKUP_ERROR} ]; then
-    EMAIL_SUBJECT="BACKUP ERROR: ${EMAIL_SUBJECT}"
-  else
-    EMAIL_SUBJECT="BACKUP OK: ${EMAIL_SUBJECT}"
-  fi
-  email_logfile
+  EMAIL_SUBJECT="BACKUP OK: ${EMAIL_SUBJECT}"
 fi
 
-if [ "${NOTIFICATION_FAILURE_ONLY}" = "yes" ]; then
-  if [ ${BACKUP_ERROR} ]; then
-    NOTIFICATION_CONTENT="BACKUP ERROR: ${HOSTNAME} - \`${LOGFILE}\`"
-    send_notification
-  fi
+[[ ${BACKUP_ERROR} || ! "$EMAIL_FAILURE_ONLY" = "yes" ]] && email_logfile
+
+# send notification
+if [ "${BACKUP_ERROR}" ]; then
+  NOTIFICATION_CONTENT="BACKUP ERROR: ${HOSTNAME} - \`$LOGFILE\`"
 else
-  if [ ${BACKUP_ERROR} ]; then
-    NOTIFICATION_CONTENT="BACKUP ERROR: ${HOSTNAME} - \`${LOGFILE}\`"
-  else
-    NOTIFICATION_CONTENT="BACKUP OK: ${HOSTNAME} - \`${LOGFILE}\`"
-  fi
-  send_notification
+  NOTIFICATION_CONTENT="BACKUP OK: ${HOSTNAME} - \`$LOGFILE\`"
 fi
 
+[[ ${BACKUP_ERROR} || ! "$NOTIFICATION_FAILURE_ONLY" = "yes" ]] && send_notification
+
 # remove old logfiles
 # stops them from piling up infinitely
 [[ -n "${REMOVE_LOGS_OLDER_THAN}" ]] && find "${LOGDIR}" -type f -mtime +"${REMOVE_LOGS_OLDER_THAN}" -delete