浏览代码

obnam params

Bob Mottram 9 年前
父节点
当前提交
08c3b56758
共有 1 个文件被更改,包括 4 次插入5 次删除
  1. 4
    5
      src/freedombone

+ 4
- 5
src/freedombone 查看文件

@@ -2469,7 +2469,7 @@ 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 "    obnam forget --keep=${BACKUP_MAX_DAYS}d" >> /usr/bin/$BACKUP_SCRIPT_NAME
2472
+      echo "    obnam forget --keep=${BACKUP_MAX_DAYS}d -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}" >> /usr/bin/$BACKUP_SCRIPT_NAME
2473 2473
       echo '    obnam backup -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}' >> /usr/bin/$BACKUP_SCRIPT_NAME
2474 2474
   else
2475 2475
       # For rsyncrypto usage see http://archive09.linux.com/feature/125322
@@ -3976,10 +3976,9 @@ function backup_directory_to_friend {
3976 3976
       echo -n '$2' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3977 3977
       echo "}')" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3978 3978
 
3979
-      echo "  obnam forget --keep=${BACKUP_MAX_DAYS}d" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME     
3980
-      echo -n '  obnam backup -r $SERVER_DIRECTORY/backup/ ' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3981
-      echo '--encrypt-with $MY_BACKUP_KEY_ID ' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3982
-      echo '${2} ${1}' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3979
+      echo -n "  obnam forget --keep=${BACKUP_MAX_DAYS}d " >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME     
3980
+      echo '-r $SERVER_DIRECTORY/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME    
3981
+      echo '  obnam backup -r $SERVER_DIRECTORY/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}' >> /usr/bin/$BACKUP_SCRIPT_NAME
3983 3982
   else
3984 3983
       # For rsyncrypto usage see http://archive09.linux.com/feature/125322
3985 3984
       echo -n '  rsyncrypto -v -r ${1} ' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME