This commit is contained in:
Bob Mottram 2016-10-27 10:37:10 +01:00
parent 763544efd7
commit 37e3818ad7
1 changed files with 4 additions and 4 deletions

View File

@ -1010,7 +1010,7 @@ function interactive_gpg_from_usb {
reconstruct_key
return 0
fi
dialog --title $"Encryption keys" \
dialog --title $"Recover Encryption Keys" \
--msgbox $"The directory $GPG_USB_MOUNT/.gnupg or $GPG_USB_MOUNT/.gnupg_fragments was not found" 6 70
umount -f $GPG_USB_MOUNT
rm -rf $GPG_USB_MOUNT
@ -1024,7 +1024,7 @@ function interactive_gpg_from_usb {
fi
cp -r $GPG_USB_MOUNT/.gnupg/* $HOME_DIR/.gnupg
GPG_LOADING="no"
dialog --title $"Encryption keys" \
dialog --title $"Recover Encryption Keys" \
--msgbox $"GPG Keyring loaded to $HOME_DIR" 6 70
else
if [ ! -d $HOME_DIR/.gnupg_fragments ]; then
@ -1039,7 +1039,7 @@ function interactive_gpg_from_usb {
mkdir $HOME_DIR/.ssh
fi
cp $GPG_USB_MOUNT/.ssh/* $HOME_DIR/.ssh
dialog --title $"Encryption keys" \
dialog --title $"Recover Encryption Keys" \
--msgbox $"ssh keys imported" 6 70
SSH_IMPORTED="yes"
fi
@ -1048,7 +1048,7 @@ function interactive_gpg_from_usb {
umount -f $GPG_USB_MOUNT
rm -rf $GPG_USB_MOUNT
if [[ $GPG_LOADING == "yes" ]]; then
dialog --title $"Encryption keys" \
dialog --title $"Recover Encryption Keys" \
--msgbox $"Now remove the USB drive. Insert the next drive containing a key fragment, or select Ok to finish" 6 70
fi
GPG_CTR=$((GPG_CTR + 1))