ソースを参照

Deletion order

Bob Mottram 7 年 前
コミット
53282fff51
共有1 個のファイルを変更した2 個の追加2 個の削除を含む
  1. 2
    2
      src/freedombone-utils-keys

+ 2
- 2
src/freedombone-utils-keys ファイルの表示

@@ -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-secret-key "$CURR_GPG_BACKUP_ID"
147 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 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 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