Browse Source

Don't need to duplicate error checking

Bob Mottram 9 years ago
parent
commit
1d98ff06a8
1 changed files with 14 additions and 13 deletions
  1. 14
    13
      src/freedombone

+ 14
- 13
src/freedombone View File

@@ -2418,19 +2418,20 @@ function get_mariadb_owncloud_admin_password {
2418 2418
 function backup_directory_to_usb {
2419 2419
   if [[ $BACKUP_TYPE == 'rsync' ]]; then
2420 2420
       echo "rsyncrypto -v -r ${1} $USB_MOUNT/backup/${2} $USB_MOUNT/backup/${2}.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2421
-      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2422
-      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2423
-      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2424
-      if [[ ${1} == "/root/temp"* ]]; then
2425
-          echo "  shred -zu ${1}/*" >> /usr/bin/$BACKUP_SCRIPT_NAME
2426
-          echo "  rm -rf ${1}" >> /usr/bin/$BACKUP_SCRIPT_NAME
2427
-      fi
2428
-      echo '  exit 853' >> /usr/bin/$BACKUP_SCRIPT_NAME
2429
-      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2430
-      if [[ ${1} == "/root/temp"* ]]; then
2431
-          echo "shred -zu ${1}/*" >> /usr/bin/$BACKUP_SCRIPT_NAME
2432
-          echo "rm -rf ${1}" >> /usr/bin/$BACKUP_SCRIPT_NAME
2433
-      fi
2421
+  fi
2422
+
2423
+  echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2424
+  echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2425
+  echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2426
+  if [[ ${1} == "/root/temp"* ]]; then
2427
+      echo "  shred -zu ${1}/*" >> /usr/bin/$BACKUP_SCRIPT_NAME
2428
+      echo "  rm -rf ${1}" >> /usr/bin/$BACKUP_SCRIPT_NAME
2429
+  fi
2430
+  echo '  exit 853' >> /usr/bin/$BACKUP_SCRIPT_NAME
2431
+  echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2432
+  if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup"* ]]; then
2433
+      echo "shred -zu ${1}/*" >> /usr/bin/$BACKUP_SCRIPT_NAME
2434
+      echo "rm -rf ${1}" >> /usr/bin/$BACKUP_SCRIPT_NAME
2434 2435
   fi
2435 2436
 }
2436 2437