Parcourir la source

Use agent during verification

Bob Mottram il y a 7 ans
Parent
révision
c9a92fd4f7
1 fichiers modifiés avec 2 ajouts et 2 suppressions
  1. 2
    2
      src/freedombone-utils-backup

+ 2
- 2
src/freedombone-utils-backup Voir le fichier

296
         exit 8352925
296
         exit 8352925
297
     fi
297
     fi
298
     if [[ $ENABLE_BACKUP_VERIFICATION == "yes" ]]; then
298
     if [[ $ENABLE_BACKUP_VERIFICATION == "yes" ]]; then
299
-        echo "$BACKUP_DUMMY_PASSWORD" | duplicity verify --gpg-options "$BACKUP_GPG_OPTIONS" --tempdir $BACKUP_TEMP_DIRECTORY --encrypt-key $MY_BACKUP_KEY_ID --full-if-older-than 4W --exclude-other-filesystems ${1} file://$USB_MOUNT/backup/${2}
299
+        echo "$BACKUP_DUMMY_PASSWORD" | duplicity verify --use-agent --gpg-options "$BACKUP_GPG_OPTIONS" --tempdir $BACKUP_TEMP_DIRECTORY --encrypt-key $MY_BACKUP_KEY_ID --full-if-older-than 4W --exclude-other-filesystems ${1} file://$USB_MOUNT/backup/${2}
300
         if [ ! "$?" = "0" ]; then
300
         if [ ! "$?" = "0" ]; then
301
             umount $USB_MOUNT
301
             umount $USB_MOUNT
302
             rm -rf $USB_MOUNT
302
             rm -rf $USB_MOUNT
424
         exit 5293526
424
         exit 5293526
425
     fi
425
     fi
426
     if [[ $ENABLE_BACKUP_VERIFICATION == "yes" ]]; then
426
     if [[ $ENABLE_BACKUP_VERIFICATION == "yes" ]]; then
427
-        echo "$BACKUP_DUMMY_PASSWORD" | duplicity verify --gpg-options "$BACKUP_GPG_OPTIONS" --tempdir $BACKUP_TEMP_DIRECTORY --ssh-askpass --encrypt-key ${ADMIN_BACKUP_KEY_ID} --full-if-older-than 4W --exclude-other-filesystems ${1} $SERVER_DIRECTORY/backup/${2}
427
+        echo "$BACKUP_DUMMY_PASSWORD" | duplicity verify --use-agent --gpg-options "$BACKUP_GPG_OPTIONS" --tempdir $BACKUP_TEMP_DIRECTORY --ssh-askpass --encrypt-key ${ADMIN_BACKUP_KEY_ID} --full-if-older-than 4W --exclude-other-filesystems ${1} $SERVER_DIRECTORY/backup/${2}
428
         if [ ! "$?" = "0" ]; then
428
         if [ ! "$?" = "0" ]; then
429
             if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
429
             if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
430
                 shred -zu ${1}/*
430
                 shred -zu ${1}/*