free
/
freedombone
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Extra options during gpg key deletion

Bob Mottram 7 years ago
parent
53282fff51
commit
d0c6e0f573
1 changed files with 4 additions and 4 deletions
Split View Show Diff Stats
  1. 4
    4
      src/freedombone-utils-keys

+ 4
- 4
src/freedombone-utils-keys View File 

@@ -143,10 +143,10 @@ function interactive_gpg_from_usb {
143 143 
                 chown -R $MY_USERNAME:$MY_USERNAME $HOME_DIR/.gnupg_old
144 144 
             fi
145 145 
             echo $'Removing old gpg keys'
146 
-            gpg --homedir=$HOME_DIR/.gnupg --delete-key "$CURR_GPG_BACKUP_ID"
147 
-            gpg --homedir=$HOME_DIR/.gnupg --delete-key "$CURR_GPG_ID"
148 
-            gpg --homedir=$HOME_DIR/.gnupg --delete-secret-key "$CURR_GPG_BACKUP_ID"
149 
-            gpg --homedir=$HOME_DIR/.gnupg --delete-secret-key "$CURR_GPG_ID"
146 
+            gpg --batch --quiet --homedir=$HOME_DIR/.gnupg --delete-key "$CURR_GPG_BACKUP_ID"
147 
+            gpg --batch --quiet --homedir=$HOME_DIR/.gnupg --delete-key "$CURR_GPG_ID"
148 
+            gpg --batch --quiet --homedir=$HOME_DIR/.gnupg --delete-secret-key "$CURR_GPG_BACKUP_ID"
149 
+            gpg --batch --quiet --homedir=$HOME_DIR/.gnupg --delete-secret-key "$CURR_GPG_ID"
150 150 
             echo $'Importing master keys'
151 151 
             gpg --homedir=$HOME_DIR/.gnupg --allow-secret-key-import --import $USB_MOUNT/.mastergpgkey
152 152 
             echo "$BACKUP_DUMMY_PASSWORD" | gpg --batch --passphrase-fd 0 --homedir=$HOME_DIR/.gnupg --allow-secret-key-import --import $USB_MOUNT/.backupgpgkey