|
@@ -2836,7 +2836,6 @@ function create_backup_script {
|
2836
|
2836
|
echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
2837
|
2837
|
|
2838
|
2838
|
echo 'sync' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
2839
|
|
- echo 'ls -lh $USB_MOUNT/backup' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
2840
|
2839
|
echo "umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
2841
|
2840
|
echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
2842
|
2841
|
echo ' echo "Unable to unmount the drive. This means that the backup did not work"' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
@@ -3685,9 +3684,9 @@ function backup_directory_to_friend {
|
3685
|
3684
|
fi
|
3686
|
3685
|
MY_BACKUP_KEY_ID=$(gpg --list-keys "$MY_NAME (backup key)" | grep 'pub ' | awk -F ' ' '{print $2}' | awk -F '/' '{print $2}')
|
3687
|
3686
|
|
3688
|
|
- echo -n 'obnam backup -r $SERVER_DIRECTORY/backup/ ' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
3689
|
|
- echo "--encrypt-with $MY_BACKUP_KEY_ID " >> /usr/bin/$BACKUP_SCRIPT_NAME
|
3690
|
|
- echo "${2} ${1}" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
3687
|
+ echo -n 'obnam backup -r $SERVER_DIRECTORY/backup/ ' >> /usr/bin/$BACKUP_TO_FRIENDSSCRIPT_NAME
|
|
3688
|
+ echo "--encrypt-with $MY_BACKUP_KEY_ID " >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
|
3689
|
+ echo "${2} ${1}" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
3691
|
3690
|
else
|
3692
|
3691
|
# For rsyncrypto usage see http://archive09.linux.com/feature/125322
|
3693
|
3692
|
echo -n "rsyncrypto -v -r ${1} " >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|