e5d57852cec56e802665a41ee1bc356a3d675c08

 1diff --git a/duplicity-backup.sh b/duplicity-backup.sh
 2index 382f751c19b8a6ac179b297b12f7785c8c06657a..699c590601711e4a2fdc4d8249614b86a162f22a 100755
 3--- a/duplicity-backup.sh
 4+++ b/duplicity-backup.sh
 5@@ -540,33 +540,41 @@ duplicity_cleanup()
 6 {
 7   echo "----------------[ Duplicity Cleanup ]----------------" >> ${LOGFILE}
 8   if [[ "${CLEAN_UP_TYPE}" != "none" && ! -z ${CLEAN_UP_TYPE} && ! -z ${CLEAN_UP_VARIABLE} ]]; then
 9-    eval ${ECHO} ${DUPLICITY} ${CLEAN_UP_TYPE} ${CLEAN_UP_VARIABLE} ${STATIC_OPTIONS} --force \
10-      ${ENCRYPT} \
11-      ${DEST} >> ${LOGFILE}
12+    {
13+      eval ${ECHO} ${DUPLICITY} ${CLEAN_UP_TYPE} ${CLEAN_UP_VARIABLE} ${STATIC_OPTIONS} --force \
14+        ${ENCRYPT} \
15+        ${DEST} >> ${LOGFILE}
16+    } || {
17+      BACKUP_ERROR=1
18+    }
19     echo >> ${LOGFILE}
20   fi
21   if [ ! -z ${REMOVE_INCREMENTALS_OLDER_THAN} ] && [[ ${REMOVE_INCREMENTALS_OLDER_THAN} =~ ^[0-9]+$ ]]; then
22-    eval ${ECHO} ${DUPLICITY} remove-all-inc-of-but-n-full ${REMOVE_INCREMENTALS_OLDER_THAN} \
23-      ${STATIC_OPTIONS} --force \
24-      ${ENCRYPT} \
25-      ${DEST} >> ${LOGFILE}
26+    {
27+      eval ${ECHO} ${DUPLICITY} remove-all-inc-of-but-n-full ${REMOVE_INCREMENTALS_OLDER_THAN} \
28+        ${STATIC_OPTIONS} --force \
29+        ${ENCRYPT} \
30+        ${DEST} >> ${LOGFILE}
31+    } || {
32+      BACKUP_ERROR=1
33+    }
34     echo >> ${LOGFILE}
35   fi
36 }
37 
38 duplicity_backup()
39 {
40-{
41-  eval ${ECHO} ${DUPLICITY} ${OPTION} ${VERBOSITY} ${STATIC_OPTIONS} \
42-  ${ENCRYPT} \
43-  ${EXCLUDE} \
44-  ${INCLUDE} \
45-  ${EXCLUDEROOT} \
46-  ${ROOT} ${DEST} \
47-  >> ${LOGFILE}
48-} || {
49-  BACKUP_ERROR=1
50-}
51+  {
52+    eval ${ECHO} ${DUPLICITY} ${OPTION} ${VERBOSITY} ${STATIC_OPTIONS} \
53+    ${ENCRYPT} \
54+    ${EXCLUDE} \
55+    ${INCLUDE} \
56+    ${EXCLUDEROOT} \
57+    ${ROOT} ${DEST} \
58+    >> ${LOGFILE}
59+  } || {
60+    BACKUP_ERROR=1
61+  }
62 }
63 
64 setup_passphrase()
65@@ -838,17 +846,17 @@ echo -e "---------    END DUPLICITY-BACKUP SCRIPT    ---------\n" >> ${LOGFILE}
66 
67 if [ ${EMAIL_FAILURE_ONLY} == "yes" ]
68 then
69-	if [ ${BACKUP_ERROR} ]; then
70-		EMAIL_SUBJECT="BACKUP ERROR: ${EMAIL_SUBJECT}"
71-		email_logfile
72-	fi
73+  if [ ${BACKUP_ERROR} ]; then
74+    EMAIL_SUBJECT="BACKUP ERROR: ${EMAIL_SUBJECT}"
75+    email_logfile
76+  fi
77 else
78-	if [ ${BACKUP_ERROR} ]; then
79-		EMAIL_SUBJECT="BACKUP ERROR: ${EMAIL_SUBJECT}"
80-	else
81-		EMAIL_SUBJECT="BACKUP OK: ${EMAIL_SUBJECT}"
82-	fi
83-		email_logfile
84+  if [ ${BACKUP_ERROR} ]; then
85+    EMAIL_SUBJECT="BACKUP ERROR: ${EMAIL_SUBJECT}"
86+  else
87+    EMAIL_SUBJECT="BACKUP OK: ${EMAIL_SUBJECT}"
88+  fi
89+  email_logfile
90 fi
91 
92 # remove old logfiles