make all scripts much more readable (#1493)

Co-authored-by: Daniel Hansson <github@hanssonit.se>

1 files changed, 24 insertions, 12 deletions

diff --git a/apps/tmbitwarden.sh b/apps/tmbitwarden.sh
index d15f1729..b6824a09 100644
--- a/apps/tmbitwarden.sh
+++ b/apps/tmbitwarden.sh
@@ -27,7 +27,7 @@ then
         then
             if [ -d /root/bwdata ] || [ -d "$BITWARDEN_HOME"/bwdata ]
             then
-msg_box "It seems like Bitwarden is already installed.
+                msg_box "It seems like Bitwarden is already installed.
 You cannot install it again because you would loose all your data and passwords.
 
 If you are certain that you definitely want to delete Bitwarden and all
@@ -45,10 +45,13 @@ fi
 
 print_text_in_color "$ICyan" "Installing Bitwarden password manager..."
 
-msg_box "Bitwarden is a password manager that is seperate from Nextcloud, though we provide this service because it's self hosted and secure.
+msg_box "Bitwarden is a password manager that is seperate from Nextcloud, \
+though we provide this service because it's self hosted and secure.
 
-To be able to use Bitwarden, you need a seperate subdomain. Please create a DNS record and point it to this server, e.g: bitwarden.yourdomain.com.
-After Bitwarden is setup, we will automatically generate a TLS cert with Let's Enrypt. There's no need to get your own prior to this setup, nor during the Bitwarden setup.
+To be able to use Bitwarden, you need a seperate subdomain.
+Please create a DNS record and point it to this server, e.g: bitwarden.yourdomain.com.
+After Bitwarden is setup, we will automatically generate a TLS cert with Let's Enrypt.
+There's no need to get your own prior to this setup, nor during the Bitwarden setup.
 
 The script is based on this documentation: https://help.bitwarden.com/article/install-on-premise/
 It's a good idea to read that before you start this script.
@@ -56,13 +59,15 @@ It's a good idea to read that before you start this script.
 Please also report any issues regarding this script setup to $ISSUES"
 
 msg_box "The necessary preparations to run expose Bitwarden to the internet are:
-1. Please open port 443 and 80 and point to this server. (You will be asked if you want to use UPNP to open those ports automatically in the next step.)
+1. Please open port 443 and 80 and point to this server.
+(You will be asked if you want to use UPNP to open those ports automatically in the next step.)
 2. Please create a DNS record for your subdomain and point that to this server.
 3. Raise the amount of RAM to this server to at least 4 GB."
 
 if ! yesno_box_yes "Have you made the necessary preparations?"
 then
-msg_box "OK, please do the necessary preparations before you run this script and then simply run it again once you're done.
+    msg_box "OK, please do the necessary preparations before you \
+run this script and then simply run it again once you're done.
 
 To run this script again, execute $SCRIPTS/menu.sh and choose Additional Apps --> Bitwarden"
     exit
@@ -154,7 +159,8 @@ check_command systemctl daemon-reload
 # Check if all ssl settings were entered correctly
 if grep ^url "$BITWARDEN_HOME"/bwdata/config.yml | grep -q https || grep ^url "$BITWARDEN_HOME"/bwdata/config.yml | grep -q localhost
 then
-    msg_box "It seems like some of the settings you entered are wrong. We will now remove Bitwarden so that you can start over with the installation."
+    msg_box "It seems like some of the settings you entered are wrong.
+We will now remove Bitwarden so that you can start over with the installation."
     check_command systemctl stop bitwarden
     docker volume prune -f
     docker system prune -af
@@ -185,13 +191,17 @@ check_command sudo -u "$BITWARDEN_USER" ./bitwarden.sh updatedb
 # Produce reverse-proxy config and get lets-encrypt certificate
 msg_box "We'll now setup the Apache Proxy that will act as TLS front for your Bitwarden installation."
 
-msg_box "Before continuing, please make sure that you have you have edited the DNS settings for $SUBDOMAIN, and opened port 80 and 443 directly to this servers IP. A full exstensive guide can be found here:
+msg_box "Before continuing, please make sure that you have you have \
+edited the DNS settings for $SUBDOMAIN, and opened port 80 and 443 \
+directly to this servers IP. A full exstensive guide can be found here:
 https://www.techandme.se/open-port-80-443
 
-This can be done automatically if you have UNNP enabled in your firewall/router. You will be offered to use UNNP in the next step.
+This can be done automatically if you have UPNP enabled in your firewall/router.
+You will be offered to use UPNP in the next step.
 
 PLEASE NOTE:
-Using other ports than the default 80 and 443 is not supported, though it may be possible with some custom modification:
+Using other ports than the default 80 and 443 is not supported, \
+though it may be possible with some custom modification:
 https://help.nextcloud.com/t/domain-refused-to-connect-collabora/91303/17"
 
 if yesno_box_no "Do you want to use UPNP to open port 80 and 443?"
@@ -348,7 +358,9 @@ to RESTART Bitwarden, simply execute: 'systemctl restart bitwarden'"
 msg_box "In case you want to backup Bitwarden, you should know that the MSSQL files are stored here:
 /var/lib/docker/volumes/docker_mssql_data/_data
 
-This is beacuse we run the database as a Docker container, and not directly on the filesystem - which otherwise would be the default.
-Reason? We found it to be more stable running in a container, several sources in their issue tracker also confirms the same thing."
+This is beacuse we run the database as a Docker container, and not \
+directly on the filesystem - which otherwise would be the default.
+Reason? We found it to be more stable running in a container, \
+several sources in their issue tracker also confirms the same thing."
 
 exit