|
@@ -312,7 +312,9 @@ function interactive_gpg_from_usb {
|
312
|
312
|
dialog --title "Encryption keys" \
|
313
|
313
|
--msgbox 'Plug in a USB drive containing a copy of your full key or key fragment' 6 70
|
314
|
314
|
|
|
315
|
+ HOME_DIR=/home/$MY_USERNAME
|
315
|
316
|
GPG_LOADING="yes"
|
|
317
|
+ SSH_IMPORTED="no"
|
316
|
318
|
GPG_CTR=0
|
317
|
319
|
while [[ $GPG_LOADING == "yes" ]]
|
318
|
320
|
do
|
|
@@ -388,14 +390,30 @@ function interactive_gpg_from_usb {
|
388
|
390
|
fi
|
389
|
391
|
|
390
|
392
|
if [ -d $GPG_USB_MOUNT/.gnupg ]; then
|
391
|
|
- cp -r $GPG_USB_MOUNT/.gnupg /home/$(grep 'MY_USERNAME' temp.cfg | awk -F '=' '{print $2}')
|
|
393
|
+ if [ ! -d $HOME_DIR/.gnupg ]; then
|
|
394
|
+ mkdir $HOME_DIR/.gnupg
|
|
395
|
+ fi
|
|
396
|
+ cp -r $GPG_USB_MOUNT/.gnupg/* $HOME_DIR/.gnupg
|
392
|
397
|
GPG_LOADING="no"
|
|
398
|
+ dialog --title "Encryption keys" \
|
|
399
|
+ --msgbox "GPG Keyring loaded to $HOME_DIR" 6 70
|
393
|
400
|
else
|
394
|
|
- cp -r $GPG_USB_MOUNT/.gnupg_fragments /home/$(grep 'MY_USERNAME' temp.cfg | awk -F '=' '{print $2}')
|
|
401
|
+ if [ ! -d $HOME_DIR/.gnupg_fragments ]; then
|
|
402
|
+ mkdir $HOME_DIR/.gnupg_fragments
|
|
403
|
+ fi
|
|
404
|
+ cp -r $GPG_USB_MOUNT/.gnupg_fragments/* $HOME_DIR/.gnupg_fragments
|
395
|
405
|
fi
|
396
|
406
|
|
397
|
|
- if [ -d $GPG_USB_MOUNT/.ssh ]; then
|
398
|
|
- cp $GPG_USB_MOUNT/.ssh/* /home/$(grep 'MY_USERNAME' temp.cfg | awk -F '=' '{print $2}')/.ssh
|
|
407
|
+ if [[ $SSH_IMPORTED == "no" ]]; then
|
|
408
|
+ if [ -d $GPG_USB_MOUNT/.ssh ]; then
|
|
409
|
+ if [ ! -d $HOME_DIR/.ssh ]; then
|
|
410
|
+ mkdir $HOME_DIR/.ssh
|
|
411
|
+ fi
|
|
412
|
+ cp $GPG_USB_MOUNT/.ssh/* $HOME_DIR/.ssh
|
|
413
|
+ dialog --title "Encryption keys" \
|
|
414
|
+ --msgbox "ssh keys imported" 6 70
|
|
415
|
+ SSH_IMPORTED="yes"
|
|
416
|
+ fi
|
399
|
417
|
fi
|
400
|
418
|
|
401
|
419
|
umount -f $GPG_USB_MOUNT
|