Browse Source

Deletion order

Bob Mottram 7 years ago
parent
commit
53282fff51
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      src/freedombone-utils-keys

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

143
                 chown -R $MY_USERNAME:$MY_USERNAME $HOME_DIR/.gnupg_old
143
                 chown -R $MY_USERNAME:$MY_USERNAME $HOME_DIR/.gnupg_old
144
             fi
144
             fi
145
             echo $'Removing old gpg keys'
145
             echo $'Removing old gpg keys'
146
-            gpg --homedir=$HOME_DIR/.gnupg --delete-secret-key "$CURR_GPG_BACKUP_ID"
147
             gpg --homedir=$HOME_DIR/.gnupg --delete-key "$CURR_GPG_BACKUP_ID"
146
             gpg --homedir=$HOME_DIR/.gnupg --delete-key "$CURR_GPG_BACKUP_ID"
148
-            gpg --homedir=$HOME_DIR/.gnupg --delete-secret-key "$CURR_GPG_ID"
149
             gpg --homedir=$HOME_DIR/.gnupg --delete-key "$CURR_GPG_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"
150
             echo $'Importing master keys'
150
             echo $'Importing master keys'
151
             gpg --homedir=$HOME_DIR/.gnupg --allow-secret-key-import --import $USB_MOUNT/.mastergpgkey
151
             gpg --homedir=$HOME_DIR/.gnupg --allow-secret-key-import --import $USB_MOUNT/.mastergpgkey
152
             echo "$BACKUP_DUMMY_PASSWORD" | gpg --batch --passphrase-fd 0 --homedir=$HOME_DIR/.gnupg --allow-secret-key-import --import $USB_MOUNT/.backupgpgkey
152
             echo "$BACKUP_DUMMY_PASSWORD" | gpg --batch --passphrase-fd 0 --homedir=$HOME_DIR/.gnupg --allow-secret-key-import --import $USB_MOUNT/.backupgpgkey