|
@@ -2427,7 +2427,8 @@ function backup_directory_to_usb {
|
2427
|
2427
|
echo ' echo "Backup key could not be found"' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
2428
|
2428
|
echo ' exit 43382' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
2429
|
2429
|
echo ' fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
2430
|
|
- echo ' MY_BACKUP_KEY_ID=$(gpg --list-keys "$MY_NAME (backup key)" | grep "pub " | awk -F " " "{print $2}" | awk -F "/" "{print $2}")' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
2430
|
+ echo -n ' MY_BACKUP_KEY_ID=$(gpg --list-keys "$MY_NAME (backup key)" ' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
2431
|
+ echo "| grep 'pub ' | awk -F ' ' '{print $2}' | awk -F '/' '{print $2}')" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
2431
|
2432
|
echo ' obnam backup -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
2432
|
2433
|
else
|
2433
|
2434
|
# For rsyncrypto usage see http://archive09.linux.com/feature/125322
|
|
@@ -3758,7 +3759,8 @@ function backup_directory_to_friend {
|
3758
|
3759
|
echo ' echo "Backup key could not be found"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
3759
|
3760
|
echo ' exit 43382' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
3760
|
3761
|
echo ' fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
3761
|
|
- echo ' MY_BACKUP_KEY_ID=$(gpg --list-keys "$MY_NAME (backup key)" | grep "pub " | awk -F " " "{print $2}" | awk -F "/" "{print $2}")' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
|
3762
|
+ echo -n ' MY_BACKUP_KEY_ID=$(gpg --list-keys "$MY_NAME (backup key)" ' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
|
3763
|
+ echo "| grep 'pub ' | awk -F ' ' '{print $2}' | awk -F '/' '{print $2}')" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
3762
|
3764
|
|
3763
|
3765
|
echo -n ' obnam backup -r $SERVER_DIRECTORY/backup/ ' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
3764
|
3766
|
echo '--encrypt-with $MY_BACKUP_KEY_ID ' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|