Sfoglia il codice sorgente

Check for tempbackup

Bob Mottram 9 anni fa
parent
commit
c69ae249a6
1 ha cambiato i file con 2 aggiunte e 6 eliminazioni
  1. 2
    6
      src/freedombone

+ 2
- 6
src/freedombone Vedi File

@@ -2424,13 +2424,13 @@ function backup_directory_to_usb {
2424 2424
   echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2425 2425
   echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2426 2426
   echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2427
-  if [[ ${1} == "/root/temp"* ]]; then
2427
+  if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
2428 2428
       echo "  shred -zu ${1}/*" >> /usr/bin/$BACKUP_SCRIPT_NAME
2429 2429
       echo "  rm -rf ${1}" >> /usr/bin/$BACKUP_SCRIPT_NAME
2430 2430
   fi
2431 2431
   echo '  exit 853' >> /usr/bin/$BACKUP_SCRIPT_NAME
2432 2432
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2433
-  if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup"* ]]; then
2433
+  if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
2434 2434
       echo "shred -zu ${1}/*" >> /usr/bin/$BACKUP_SCRIPT_NAME
2435 2435
       echo "rm -rf ${1}" >> /usr/bin/$BACKUP_SCRIPT_NAME
2436 2436
   fi
@@ -2759,7 +2759,6 @@ function create_backup_script {
2759 2759
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2760 2760
   echo '  cp -f /home/$MY_USERNAME/README /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2761 2761
   backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' readme
2762
-  echo '  rm -rf /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2763 2762
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2764 2763
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2765 2764
 
@@ -2777,7 +2776,6 @@ function create_backup_script {
2777 2776
   echo "    mkdir -p $USB_MOUNT/backup/mutt" >> /usr/bin/$BACKUP_SCRIPT_NAME
2778 2777
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2779 2778
   backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' mutt
2780
-  echo '  rm -rf /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2781 2779
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2782 2780
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2783 2781
 
@@ -2792,7 +2790,6 @@ function create_backup_script {
2792 2790
   echo "    mkdir -p $USB_MOUNT/backup/procmail" >> /usr/bin/$BACKUP_SCRIPT_NAME
2793 2791
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2794 2792
   backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' procmail
2795
-  echo '  rm -rf /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2796 2793
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2797 2794
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2798 2795
 
@@ -2845,7 +2842,6 @@ function create_backup_script {
2845 2842
   echo "    mkdir -p $USB_MOUNT/backup/voip" >> /usr/bin/$BACKUP_SCRIPT_NAME
2846 2843
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2847 2844
   backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' voip
2848
-  echo '  rm -rf /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2849 2845
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2850 2846
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2851 2847