瀏覽代碼

Check for backup key file

Bob Mottram 8 年之前
父節點
當前提交
c1bd5c9691
共有 1 個文件被更改,包括 5 次插入1 次删除
  1. 5
    1
      src/freedombone-utils-keys

+ 5
- 1
src/freedombone-utils-keys 查看文件

119
             cp -r $USB_MOUNT/letsencrypt/* /etc/letsencrypt
119
             cp -r $USB_MOUNT/letsencrypt/* /etc/letsencrypt
120
         fi
120
         fi
121
 
121
 
122
-        if [ -f $USB_MOUNT/.mastergpgkey && -f $USB_MOUNT/.backupgpgkey ]; then
122
+        if [ -f $USB_MOUNT/.mastergpgkey ]; then
123
             # Recovering keys from file rather than just copying the gnupg
123
             # Recovering keys from file rather than just copying the gnupg
124
             # directory may help to avoid problems during upgrades/reinstalls
124
             # directory may help to avoid problems during upgrades/reinstalls
125
+            if [ ! -f $USB_MOUNT/.backupgpgkey ]; then
126
+                echo $'No backup key file found on USB drive'
127
+                exit 725729
128
+            fi
125
             gpg --homedir=/home/$MY_USERNAME/.gnupg --allow-secret-key-import --import $USB_MOUNT/.mastergpgkey
129
             gpg --homedir=/home/$MY_USERNAME/.gnupg --allow-secret-key-import --import $USB_MOUNT/.mastergpgkey
126
             echo "$BACKUP_DUMMY_PASSWORD" | gpg --batch --passphrase-fd 0 --homedir=/home/$MY_USERNAME/.gnupg --allow-secret-key-import --import $USB_MOUNT/.backupgpgkey
130
             echo "$BACKUP_DUMMY_PASSWORD" | gpg --batch --passphrase-fd 0 --homedir=/home/$MY_USERNAME/.gnupg --allow-secret-key-import --import $USB_MOUNT/.backupgpgkey
127
             if [ -d /home/$MY_USERNAME/.gnupg ]; then
131
             if [ -d /home/$MY_USERNAME/.gnupg ]; then