|
@@ -141,6 +141,9 @@ if [[ $MASTER_DRIVE == "yes" || $MASTER_DRIVE == "y" || $MASTER_DRIVE == "1" ]];
|
141
|
141
|
|
142
|
142
|
# export the gpg key and backup key as text
|
143
|
143
|
# so that it may be imported at the beginning of new installs
|
|
144
|
+ GPG_TTY=$(tty)
|
|
145
|
+ export GPG_TTY
|
|
146
|
+
|
144
|
147
|
USER_EMAIL_ADDRESS=$MY_USERNAME@$HOSTNAME
|
145
|
148
|
GPG_ID=$(gpg --list-keys $USER_EMAIL_ADDRESS | sed -n '2p' | sed 's/^[ \t]*//')
|
146
|
149
|
GPG_BACKUP_ID=$(gpg --list-keys "(backup key)" | sed -n '2p' | sed 's/^[ \t]*//')
|
|
@@ -161,15 +164,15 @@ if [[ $MASTER_DRIVE == "yes" || $MASTER_DRIVE == "y" || $MASTER_DRIVE == "1" ]];
|
161
|
164
|
fi
|
162
|
165
|
|
163
|
166
|
backupgpgkey=$(gpg --armor --export $GPG_BACKUP_ID)
|
164
|
|
- if [[ "$gpgkey" == *"$gpgerrstr"* ]]; then
|
165
|
|
- echo $'Problem exporting public gpg key'
|
166
|
|
- echo "$gpgkey"
|
|
167
|
+ if [[ "$backupgpgkey" == *"$gpgerrstr"* ]]; then
|
|
168
|
+ echo $'Problem exporting public gpg backup key'
|
|
169
|
+ echo "$backupgpgkey"
|
167
|
170
|
exit 735282
|
168
|
171
|
fi
|
169
|
172
|
backupgpgprivkey=$(gpg --armor --export-secret-key $GPG_BACKUP_ID)
|
170
|
|
- if [[ "$gpgprivkey" == *"$gpgerrstr"* ]]; then
|
171
|
|
- echo $'Problem exporting private gpg key'
|
172
|
|
- echo "$gpgprivkey"
|
|
173
|
+ if [[ "$backupgpgprivkey" == *"$gpgerrstr"* ]]; then
|
|
174
|
+ echo $'Problem exporting private gpg backup key'
|
|
175
|
+ echo "$backupgpgprivkey"
|
173
|
176
|
gpgprivkey=
|
174
|
177
|
exit 629362
|
175
|
178
|
fi
|