From d0c6e0f57353e7487070bd4ac7218cb9925bb279 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 23 Jun 2017 23:56:14 +0100
Subject: [PATCH] Extra options during gpg key deletion
---
src/freedombone-utils-keys | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/freedombone-utils-keys b/src/freedombone-utils-keys
index 580d24517..2b6341964 100755
--- a/src/freedombone-utils-keys
+++ b/src/freedombone-utils-keys
@@ -143,10 +143,10 @@ function interactive_gpg_from_usb {
chown -R $MY_USERNAME:$MY_USERNAME $HOME_DIR/.gnupg_old
fi
echo $'Removing old gpg keys'
- gpg --homedir=$HOME_DIR/.gnupg --delete-key "$CURR_GPG_BACKUP_ID"
- gpg --homedir=$HOME_DIR/.gnupg --delete-key "$CURR_GPG_ID"
- gpg --homedir=$HOME_DIR/.gnupg --delete-secret-key "$CURR_GPG_BACKUP_ID"
- gpg --homedir=$HOME_DIR/.gnupg --delete-secret-key "$CURR_GPG_ID"
+ gpg --batch --quiet --homedir=$HOME_DIR/.gnupg --delete-key "$CURR_GPG_BACKUP_ID"
+ gpg --batch --quiet --homedir=$HOME_DIR/.gnupg --delete-key "$CURR_GPG_ID"
+ gpg --batch --quiet --homedir=$HOME_DIR/.gnupg --delete-secret-key "$CURR_GPG_BACKUP_ID"
+ gpg --batch --quiet --homedir=$HOME_DIR/.gnupg --delete-secret-key "$CURR_GPG_ID"
echo $'Importing master keys'
gpg --homedir=$HOME_DIR/.gnupg --allow-secret-key-import --import $USB_MOUNT/.mastergpgkey
echo "$BACKUP_DUMMY_PASSWORD" | gpg --batch --passphrase-fd 0 --homedir=$HOME_DIR/.gnupg --allow-secret-key-import --import $USB_MOUNT/.backupgpgkey
--
GitLab