From 53282fff5123480e90a6f7b46e02013015f8629b Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Fri, 23 Jun 2017 23:44:05 +0100 Subject: [PATCH] Deletion order --- src/freedombone-utils-keys | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/freedombone-utils-keys b/src/freedombone-utils-keys index b7b27057..580d2451 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-secret-key "$CURR_GPG_BACKUP_ID" gpg --homedir=$HOME_DIR/.gnupg --delete-key "$CURR_GPG_BACKUP_ID" - gpg --homedir=$HOME_DIR/.gnupg --delete-secret-key "$CURR_GPG_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" 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