From 839e129c5fe1cdb2ac85dabe5e1d66842318dace Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 23 Jun 2017 17:01:55 +0100
Subject: [PATCH] Exporting backup key to keydrive

---
 src/freedombone-keydrive | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/freedombone-keydrive b/src/freedombone-keydrive
index f9adef8d..587e2671 100755
--- a/src/freedombone-keydrive
+++ b/src/freedombone-keydrive
@@ -141,6 +141,9 @@ if [[ $MASTER_DRIVE == "yes" || $MASTER_DRIVE == "y" || $MASTER_DRIVE == "1" ]];
 
   # export the gpg key and backup key as text
   # so that it may be imported at the beginning of new installs
+  GPG_TTY=$(tty)
+  export GPG_TTY
+
   USER_EMAIL_ADDRESS=$MY_USERNAME@$HOSTNAME
   GPG_ID=$(gpg --list-keys $USER_EMAIL_ADDRESS | sed -n '2p' | sed 's/^[ \t]*//')
   GPG_BACKUP_ID=$(gpg --list-keys "(backup key)" | sed -n '2p' | sed 's/^[ \t]*//')
@@ -161,15 +164,15 @@ if [[ $MASTER_DRIVE == "yes" || $MASTER_DRIVE == "y" || $MASTER_DRIVE == "1" ]];
   fi
 
   backupgpgkey=$(gpg --armor --export $GPG_BACKUP_ID)
-  if [[ "$gpgkey" == *"$gpgerrstr"* ]]; then
-      echo $'Problem exporting public gpg key'
-      echo "$gpgkey"
+  if [[ "$backupgpgkey" == *"$gpgerrstr"* ]]; then
+      echo $'Problem exporting public gpg backup key'
+      echo "$backupgpgkey"
       exit 735282
   fi
   backupgpgprivkey=$(gpg --armor --export-secret-key $GPG_BACKUP_ID)
-  if [[ "$gpgprivkey" == *"$gpgerrstr"* ]]; then
-      echo $'Problem exporting private gpg key'
-      echo "$gpgprivkey"
+  if [[ "$backupgpgprivkey" == *"$gpgerrstr"* ]]; then
+      echo $'Problem exporting private gpg backup key'
+      echo "$backupgpgprivkey"
       gpgprivkey=
       exit 629362
   fi