Parcourir la source

Only forget old backups if the directory already exists

Bob Mottram il y a 9 ans
Parent
révision
2f39f4d6c6
1 fichiers modifiés avec 7 ajouts et 3 suppressions
  1. 7
    3
      src/freedombone

+ 7
- 3
src/freedombone Voir le fichier

@@ -2469,8 +2469,10 @@ function backup_directory_to_usb {
2469 2469
       echo -n "}' | awk -F '/' '{print " >> /usr/bin/$BACKUP_SCRIPT_NAME
2470 2470
       echo -n '$2' >> /usr/bin/$BACKUP_SCRIPT_NAME
2471 2471
       echo "}')" >> /usr/bin/$BACKUP_SCRIPT_NAME
2472
-      echo -n "    obnam forget --keep=${BACKUP_MAX_DAYS}d " >> /usr/bin/$BACKUP_SCRIPT_NAME
2473
-	  echo '-r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}' >> /usr/bin/$BACKUP_SCRIPT_NAME
2472
+      echo '    if [ -d $USB_MOUNT/backup/${2} ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2473
+      echo -n "      obnam forget --keep=${BACKUP_MAX_DAYS}d " >> /usr/bin/$BACKUP_SCRIPT_NAME
2474
+      echo '-r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}' >> /usr/bin/$BACKUP_SCRIPT_NAME
2475
+      echo '    fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2474 2476
       echo '    obnam backup -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}' >> /usr/bin/$BACKUP_SCRIPT_NAME
2475 2477
   else
2476 2478
       # For rsyncrypto usage see http://archive09.linux.com/feature/125322
@@ -3977,8 +3979,10 @@ function backup_directory_to_friend {
3977 3979
       echo -n '$2' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3978 3980
       echo "}')" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3979 3981
 
3980
-      echo -n "  obnam forget --keep=${BACKUP_MAX_DAYS}d " >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3982
+      echo '  if [ -d $SERVER_DIRECTORY/backup/${2} ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3983
+      echo -n "    obnam forget --keep=${BACKUP_MAX_DAYS}d " >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3981 3984
       echo '-r $SERVER_DIRECTORY/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3985
+      echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3982 3986
       echo '  obnam backup -r $SERVER_DIRECTORY/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}' >> /usr/bin/$BACKUP_SCRIPT_NAME
3983 3987
   else
3984 3988
       # For rsyncrypto usage see http://archive09.linux.com/feature/125322