From 9432db1cf1cd3c2c82dba9dbfb67566a4ca31f9a Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sat, 26 Sep 2015 13:33:18 +0100
Subject: [PATCH] Backup key parameters

---
 src/freedombone | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/freedombone b/src/freedombone
index cbc9cdd4..c832ca82 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -2428,7 +2428,11 @@ function backup_directory_to_usb {
       echo '      exit 43382' >> /usr/bin/$BACKUP_SCRIPT_NAME
       echo '    fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
       echo -n '    MY_BACKUP_KEY_ID=$(gpg --list-keys "$MY_NAME (backup key)" ' >> /usr/bin/$BACKUP_SCRIPT_NAME
-      echo "| grep 'pub ' | awk -F ' ' '{print $2}' | awk -F '/' '{print $2}')" >> /usr/bin/$BACKUP_SCRIPT_NAME
+      echo -n "| grep 'pub ' | awk -F ' ' '{print " >> /usr/bin/$BACKUP_SCRIPT_NAME
+      echo -n '$2' >> /usr/bin/$BACKUP_SCRIPT_NAME
+      echo -n "}' | awk -F '/' '{print " >> /usr/bin/$BACKUP_SCRIPT_NAME
+      echo -n '$2' >> /usr/bin/$BACKUP_SCRIPT_NAME
+      echo "}')" >> /usr/bin/$BACKUP_SCRIPT_NAME
       echo '    obnam backup -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}' >> /usr/bin/$BACKUP_SCRIPT_NAME
   else
       # For rsyncrypto usage see http://archive09.linux.com/feature/125322
@@ -3760,7 +3764,11 @@ function backup_directory_to_friend {
       echo '    exit 43382' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
       echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
       echo -n '  MY_BACKUP_KEY_ID=$(gpg --list-keys "$MY_NAME (backup key)" ' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-      echo "| grep 'pub ' | awk -F ' ' '{print $2}' | awk -F '/' '{print $2}')" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
+      echo -n "| grep 'pub ' | awk -F ' ' '{print " >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
+      echo -n '$2' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
+      echo -n "}' | awk -F '/' '{print " >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
+      echo -n '$2' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
+      echo "}')" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
 
       echo -n '  obnam backup -r $SERVER_DIRECTORY/backup/ ' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
       echo '--encrypt-with $MY_BACKUP_KEY_ID ' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME