From 6f54f4b515031f4736fe1a357184c852d7f69590 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 23 Jun 2017 18:18:08 +0100
Subject: [PATCH] Export backup key with password

---
 src/freedombone-keydrive | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/freedombone-keydrive b/src/freedombone-keydrive
index 5926d73d..9b98943c 100755
--- a/src/freedombone-keydrive
+++ b/src/freedombone-keydrive
@@ -155,6 +155,8 @@ if [[ $MASTER_DRIVE == "yes" || $MASTER_DRIVE == "y" || $MASTER_DRIVE == "1" ]];
       echo "$gpgkey"
       exit 735282
   fi
+  echo ''
+  echo $'Enter your gpg private key passphrase:'
   gpgprivkey=$(gpg --homedir=/home/$MY_USERNAME/.gnupg --armor --export-secret-key $GPG_ID)
   if [[ "$gpgprivkey" == *"$gpgerrstr"* ]]; then
       echo $'Problem exporting private gpg key'
@@ -163,13 +165,16 @@ if [[ $MASTER_DRIVE == "yes" || $MASTER_DRIVE == "y" || $MASTER_DRIVE == "1" ]];
       exit 629362
   fi
 
+  # Dummy password to get around not being able to create a key without passphrase
+  BACKUP_DUMMY_PASSWORD='backup'
+
   backupgpgkey=$(gpg --homedir=/home/$MY_USERNAME/.gnupg --armor --export $GPG_BACKUP_ID)
   if [[ "$backupgpgkey" == *"$gpgerrstr"* ]]; then
       echo $'Problem exporting public gpg backup key'
       echo "$backupgpgkey"
       exit 735282
   fi
-  backupgpgprivkey=$(gpg --homedir=/home/$MY_USERNAME/.gnupg --armor --export-secret-key $GPG_BACKUP_ID)
+  backupgpgprivkey=$(echo "$BACKUP_DUMMY_PASSWORD" | gpg --batch --passphrase-fd 0 --homedir=/home/$MY_USERNAME/.gnupg --armor --export-secret-key $GPG_BACKUP_ID)
   if [[ "$backupgpgprivkey" == *"$gpgerrstr"* ]]; then
       echo $'Problem exporting private gpg backup key'
       echo "$backupgpgprivkey"