From 8b272df109b12c456121da35447530e22417619c Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Tue, 13 Feb 2018 22:58:07 +0000
Subject: [PATCH] Tidying

---
 src/freedombone-app-bdsmail | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/freedombone-app-bdsmail b/src/freedombone-app-bdsmail
index 3499d4fc..32555e02 100755
--- a/src/freedombone-app-bdsmail
+++ b/src/freedombone-app-bdsmail
@@ -248,6 +248,9 @@ function remove_bdsmail {
     rm /usr/bin/bdsmail_domain
     sed -i '/bdsmail_distribute/d' /etc/crontab
     rm /usr/bin/bdsmail_distribute
+    if [ -f /etc/skel/.mutt/bdsmail ]; then
+        rm /etc/skel/.mutt/bdsmail
+    fi
 }
 
 function install_bdsmail {
@@ -387,7 +390,9 @@ function install_bdsmail {
     $BDSMAIL_DIR/bin/mailtool $BDSMAIL_DIR/config.ini admin $BDSMAIL_DIR/Maildir/i2p/admin "$bdsmail_admin_password"
 
     # Create mutt configuration
-    mkdir /etc/skel/.mutt
+    if [ ! -d /etc/skel/.mutt ]; then
+        mkdir /etc/skel/.mutt
+    fi
     echo 'set mbox_type=Maildir' > /etc/skel/.mutt/bdsmail
     echo "set smtp_url=smtp://admin:${bdsmail_admin_password}@127.0.0.1:$I2P_SMTP_PORT/" >> /etc/skel/.mutt/bdsmail
     echo 'set use_from=yes' >> /etc/skel/.mutt/bdsmail