From f43a1d604ddfdee2c3aa45adba7ad84b514a3914 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Fri, 28 Oct 2016 12:18:54 +0100
Subject: [PATCH] Removing webmail entries from the readme
---
src/freedombone-app-webmail | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/freedombone-app-webmail b/src/freedombone-app-webmail
index 26ee65b9b..00af1d1af 100755
--- a/src/freedombone-app-webmail
+++ b/src/freedombone-app-webmail
@@ -136,8 +136,10 @@ function remove_webmail {
if [ -d $WEB_PATH/webmail ]; then
rm -rf $WEB_PATH/webmail
fi
- sed -i '/Webmail /d' $COMPLETION_FILE
- sed -i '/webmail /d' $COMPLETION_FILE
+ sed -i '/Webmail/d' $COMPLETION_FILE
+ sed -i '/webmail/d' $COMPLETION_FILE
+ sed -i '/Webmail/d' /home/$MY_USERNAME/README
+ sed -i '/webmail/d' /home/$MY_USERNAME/README
remove_completion_param install_webmail
}
@@ -245,12 +247,11 @@ function install_webmail {
if ! grep -q "Webmail" /home/$MY_USERNAME/README; then
echo '' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README
- echo 'Webmail' >> /home/$MY_USERNAME/README
- echo '=======' >> /home/$MY_USERNAME/README
+ echo '# Webmail' >> /home/$MY_USERNAME/README
if [[ $ONION_ONLY == 'no' ]]; then
- echo $"Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php" >> /home/$MY_USERNAME/README
+ echo $"To access webmail open https://$DEFAULT_DOMAIN_NAME/webmail/index.php" >> /home/$MY_USERNAME/README
else
- echo $"Open http://$WEBMAIL_ONION_HOSTNAME" >> /home/$MY_USERNAME/README
+ echo $"To access webmail open http://$WEBMAIL_ONION_HOSTNAME" >> /home/$MY_USERNAME/README
fi
echo $"MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
--
GitLab