From 30dd79a83c90386ad1fa5a565ae83ab49058a6de Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 21 Jun 2017 20:48:35 +0100
Subject: [PATCH] Just check for gnupg directory
---
src/freedombone-base-email | 6 +-----
src/freedombone-utils-keys | 1 -
src/freedombone-utils-setup | 1 -
3 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/src/freedombone-base-email b/src/freedombone-base-email
index 4dff569fc..d1d37e639 100755
--- a/src/freedombone-base-email
+++ b/src/freedombone-base-email
@@ -48,9 +48,6 @@ GPG_KEYSERVER="hkp://keys.gnupg.net"
# whether to encrypt all incoming email with your public key
GPG_ENCRYPT_STORED_EMAIL="yes"
-# gets set to yes if gpg keys are imported from usb
-GPG_KEYS_IMPORTED="no"
-
# optionally you can provide your exported GPG key pair here
# Note that the private key file will be deleted after use
# If these are unspecified then a new GPG key will be created
@@ -1530,13 +1527,12 @@ function configure_gpg {
gpg_dir=/home/$MY_USERNAME/.gnupg
# if gpg keys directory was previously imported from usb
- echo $"GPG keys imported: $GPG_KEYS_IMPORTED"
if [ -d $gpg_dir ]; then
echo $'GPG directory exists'
else
echo $"GPG directory $gpg_dir was not found"
fi
- if [[ $GPG_KEYS_IMPORTED == "yes" && -d $gpg_dir ]]; then
+ if [ -d $gpg_dir ]; then
echo $'GPG keys were imported'
sed -i "s|keyserver hkp://keys.gnupg.net|keyserver $GPG_KEYSERVER|g" $gpg_dir/gpg.conf
MY_GPG_PUBLIC_KEY_ID=$(gpg_pubkey_from_email "$MY_USERNAME" "$MY_EMAIL_ADDRESS")
diff --git a/src/freedombone-utils-keys b/src/freedombone-utils-keys
index 49b233583..cd5f72b51 100755
--- a/src/freedombone-utils-keys
+++ b/src/freedombone-utils-keys
@@ -240,7 +240,6 @@ function interactive_key_recovery {
${PROJECT_NAME}-recoverkey -u $MY_USERNAME
if [ -d /home/$MY_USERNAME/.gnupg ]; then
cp -rf /home/$MY_USERNAME/.gnupg /root
- GPG_KEYS_IMPORTED='yes'
fi
}
diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup
index 53d96361e..a488da743 100755
--- a/src/freedombone-utils-setup
+++ b/src/freedombone-utils-setup
@@ -259,7 +259,6 @@ function search_for_attached_usb_drive {
echo $'Importing GPG keyring'
cp -r $USB_MOUNT/.gnupg /home/$MY_USERNAME
chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
- GPG_KEYS_IMPORTED="yes"
if [ ! -f /home/$MY_USERNAME/.gnupg/secring.gpg ]; then
echo $'GPG files did not copy'
exit 73529
--
GitLab