From 1d98ff06a8aea8ce38dd368aa3cc356ad1d77503 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sun, 13 Sep 2015 14:16:26 +0100
Subject: [PATCH] Don't need to duplicate error checking

---
 src/freedombone | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/freedombone b/src/freedombone
index 99719de8..ea64d69d 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -2418,19 +2418,20 @@ function get_mariadb_owncloud_admin_password {
 function backup_directory_to_usb {
   if [[ $BACKUP_TYPE == 'rsync' ]]; then
       echo "rsyncrypto -v -r ${1} $USB_MOUNT/backup/${2} $USB_MOUNT/backup/${2}.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
-      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
-      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
-      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
-      if [[ ${1} == "/root/temp"* ]]; then
-          echo "  shred -zu ${1}/*" >> /usr/bin/$BACKUP_SCRIPT_NAME
-          echo "  rm -rf ${1}" >> /usr/bin/$BACKUP_SCRIPT_NAME
-      fi
-      echo '  exit 853' >> /usr/bin/$BACKUP_SCRIPT_NAME
-      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
-      if [[ ${1} == "/root/temp"* ]]; then
-          echo "shred -zu ${1}/*" >> /usr/bin/$BACKUP_SCRIPT_NAME
-          echo "rm -rf ${1}" >> /usr/bin/$BACKUP_SCRIPT_NAME
-      fi
+  fi
+
+  echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
+  echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
+  echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
+  if [[ ${1} == "/root/temp"* ]]; then
+      echo "  shred -zu ${1}/*" >> /usr/bin/$BACKUP_SCRIPT_NAME
+      echo "  rm -rf ${1}" >> /usr/bin/$BACKUP_SCRIPT_NAME
+  fi
+  echo '  exit 853' >> /usr/bin/$BACKUP_SCRIPT_NAME
+  echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
+  if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup"* ]]; then
+      echo "shred -zu ${1}/*" >> /usr/bin/$BACKUP_SCRIPT_NAME
+      echo "rm -rf ${1}" >> /usr/bin/$BACKUP_SCRIPT_NAME
   fi
 }