From c1bd5c96910f3dc5549fb075ce76be04f7ed30b6 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 23 Jun 2017 18:39:20 +0100
Subject: [PATCH] Check for backup key file

---
 src/freedombone-utils-keys | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/freedombone-utils-keys b/src/freedombone-utils-keys
index 9d4a02fb..d757351a 100755
--- a/src/freedombone-utils-keys
+++ b/src/freedombone-utils-keys
@@ -119,9 +119,13 @@ function interactive_gpg_from_usb {
             cp -r $USB_MOUNT/letsencrypt/* /etc/letsencrypt
         fi
 
-        if [ -f $USB_MOUNT/.mastergpgkey && -f $USB_MOUNT/.backupgpgkey ]; then
+        if [ -f $USB_MOUNT/.mastergpgkey ]; then
             # Recovering keys from file rather than just copying the gnupg
             # directory may help to avoid problems during upgrades/reinstalls
+            if [ ! -f $USB_MOUNT/.backupgpgkey ]; then
+                echo $'No backup key file found on USB drive'
+                exit 725729
+            fi
             gpg --homedir=/home/$MY_USERNAME/.gnupg --allow-secret-key-import --import $USB_MOUNT/.mastergpgkey
             echo "$BACKUP_DUMMY_PASSWORD" | gpg --batch --passphrase-fd 0 --homedir=/home/$MY_USERNAME/.gnupg --allow-secret-key-import --import $USB_MOUNT/.backupgpgkey
             if [ -d /home/$MY_USERNAME/.gnupg ]; then