|
@@ -48,9 +48,6 @@ GPG_KEYSERVER="hkp://keys.gnupg.net"
|
48
|
48
|
# whether to encrypt all incoming email with your public key
|
49
|
49
|
GPG_ENCRYPT_STORED_EMAIL="yes"
|
50
|
50
|
|
51
|
|
-# gets set to yes if gpg keys are imported from usb
|
52
|
|
-GPG_KEYS_IMPORTED="no"
|
53
|
|
-
|
54
|
51
|
# optionally you can provide your exported GPG key pair here
|
55
|
52
|
# Note that the private key file will be deleted after use
|
56
|
53
|
# If these are unspecified then a new GPG key will be created
|
|
@@ -1530,13 +1527,12 @@ function configure_gpg {
|
1530
|
1527
|
gpg_dir=/home/$MY_USERNAME/.gnupg
|
1531
|
1528
|
|
1532
|
1529
|
# if gpg keys directory was previously imported from usb
|
1533
|
|
- echo $"GPG keys imported: $GPG_KEYS_IMPORTED"
|
1534
|
1530
|
if [ -d $gpg_dir ]; then
|
1535
|
1531
|
echo $'GPG directory exists'
|
1536
|
1532
|
else
|
1537
|
1533
|
echo $"GPG directory $gpg_dir was not found"
|
1538
|
1534
|
fi
|
1539
|
|
- if [[ $GPG_KEYS_IMPORTED == "yes" && -d $gpg_dir ]]; then
|
|
1535
|
+ if [ -d $gpg_dir ]; then
|
1540
|
1536
|
echo $'GPG keys were imported'
|
1541
|
1537
|
sed -i "s|keyserver hkp://keys.gnupg.net|keyserver $GPG_KEYSERVER|g" $gpg_dir/gpg.conf
|
1542
|
1538
|
MY_GPG_PUBLIC_KEY_ID=$(gpg_pubkey_from_email "$MY_USERNAME" "$MY_EMAIL_ADDRESS")
|