From 5f9fdcb159065f751b0cc4c8fe4dceeba28883b8 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 5 Feb 2018 14:57:38 +0000
Subject: [PATCH] Tidying

---
 src/freedombone-base-email | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/freedombone-base-email b/src/freedombone-base-email
index acc5c6da..d11c24e8 100755
--- a/src/freedombone-base-email
+++ b/src/freedombone-base-email
@@ -1423,9 +1423,9 @@ function configure_gpg {
     chown -R $MY_USERNAME:$MY_USERNAME $gpg_dir
     chmod 700 $gpg_dir
     chmod 600 $gpg_dir/*
-    printf '%%Assuan%%\nsocket=/dev/shm/S.dirmngr\n' > /home/$MY_USERNAME/.gnupg/S.dirmngr
-    if [ -d /home/$MY_USERNAME/.gnupg/crls.d ]; then
-        chmod +x /home/$MY_USERNAME/.gnupg/crls.d
+    printf '%%Assuan%%\nsocket=/dev/shm/S.dirmngr\n' > $gpg_dir/S.dirmngr
+    if [ -d $gpg_dir/crls.d ]; then
+        chmod +x $gpg_dir/crls.d
     fi
 
     if [[ $MY_GPG_PUBLIC_KEY && $MY_GPG_PRIVATE_KEY ]]; then
@@ -1475,9 +1475,9 @@ function configure_gpg {
         cp -r /home/$MY_USERNAME/.gnupg /root/
         chmod 700 /root/.gnupg
         chmod 600 /root/.gnupg/*
-        printf '%%Assuan%%\nsocket=/dev/shm/S.dirmngr\n' > /home/$MY_USERNAME/.gnupg/S.dirmngr
-        if [ -d /home/$MY_USERNAME/.gnupg/crls.d ]; then
-            chmod +x /home/$MY_USERNAME/.gnupg/crls.d
+        printf '%%Assuan%%\nsocket=/dev/shm/S.dirmngr\n' > /root/.gnupg/S.dirmngr
+        if [ -d /root/.gnupg/crls.d ]; then
+            chmod +x /root/.gnupg/crls.d
         fi
     fi