Pārlūkot izejas kodu

Removing webmail entries from the readme

Bob Mottram 8 gadus atpakaļ
vecāks
revīzija
f43a1d604d
1 mainītis faili ar 7 papildinājumiem un 6 dzēšanām
  1. 7
    6
      src/freedombone-app-webmail

+ 7
- 6
src/freedombone-app-webmail Parādīt failu

@@ -136,8 +136,10 @@ function remove_webmail {
136 136
     if [ -d $WEB_PATH/webmail ]; then
137 137
         rm -rf $WEB_PATH/webmail
138 138
     fi
139
-    sed -i '/Webmail /d' $COMPLETION_FILE
140
-    sed -i '/webmail /d' $COMPLETION_FILE
139
+    sed -i '/Webmail/d' $COMPLETION_FILE
140
+    sed -i '/webmail/d' $COMPLETION_FILE
141
+    sed -i '/Webmail/d' /home/$MY_USERNAME/README
142
+    sed -i '/webmail/d' /home/$MY_USERNAME/README
141 143
     remove_completion_param install_webmail
142 144
 }
143 145
 
@@ -245,12 +247,11 @@ function install_webmail {
245 247
     if ! grep -q "Webmail" /home/$MY_USERNAME/README; then
246 248
         echo '' >> /home/$MY_USERNAME/README
247 249
         echo '' >> /home/$MY_USERNAME/README
248
-        echo 'Webmail' >> /home/$MY_USERNAME/README
249
-        echo '=======' >> /home/$MY_USERNAME/README
250
+        echo '# Webmail' >> /home/$MY_USERNAME/README
250 251
         if [[ $ONION_ONLY == 'no' ]]; then
251
-            echo $"Open https://$DEFAULT_DOMAIN_NAME/webmail/index.php" >> /home/$MY_USERNAME/README
252
+            echo $"To access webmail open https://$DEFAULT_DOMAIN_NAME/webmail/index.php" >> /home/$MY_USERNAME/README
252 253
         else
253
-            echo $"Open http://$WEBMAIL_ONION_HOSTNAME" >> /home/$MY_USERNAME/README
254
+            echo $"To access webmail open http://$WEBMAIL_ONION_HOSTNAME" >> /home/$MY_USERNAME/README
254 255
         fi
255 256
         echo $"MariaDB webmail admin password: $WEBMAIL_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
256 257
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README