From 8b85abd30f0da449d85ff65b031daa51aba62d52 Mon Sep 17 00:00:00 2001
From: "b.waal" <b.waal79@upcmail.nl>
Date: Wed, 5 Aug 2020 15:26:42 +0200
Subject: [PATCH] Fixed oopsie and added msg's

---
 AppendCMS.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/AppendCMS.sh b/AppendCMS.sh
index 4e5f59f..e536061 100644
--- a/AppendCMS.sh
+++ b/AppendCMS.sh
@@ -175,12 +175,12 @@ fi
 #   Preconf   #
 ##-----------##
 
-echo "Running preconf for Webserv"
+msg "           Running preconf for Webserv"
 if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/CoreModules/"$webserv"/appendCMS-preconf.sh; then
     source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/CoreModules/"$webserv"/appendCMS-preconf.sh)
 fi
 
-echo "Running preconf for CMS"
+msg "            Running preconf for CMS"
 if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/CMS/"$CMS"/preconf.sh; then
     source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/CMS/"$CMS"/preconf.sh)
 fi
@@ -203,13 +203,13 @@ cat /tmp/apt.list | xargs $PKGI
 #   Configuring   #
 ##---------------##
 
-echo "Running conf for Webserv"
+msg "           Running conf for Webserv"
 if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/CoreModules/"$webserv"/appendCMS-conf.sh; then
     source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/CoreModules/"$webserv"/appendCMS-conf.sh)
 fi
 
-echo "Setting up SSL"
 if [ $sslenable = 1 ]; then
+msg "                Setting up SSL"
     if [ $domainwww = 1 ]; then
         certbot --"$webserv" -n -d "$domain" -d "www.$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos
     elif [ $domainwww = 0 ]; then
@@ -220,7 +220,7 @@ fi
 wget -q -t7 "$repo"/raw/branch/"$branch"/Scripts/EnableSSL.sh -O ~/activateSSL-$domain.sh
 sed -i -e 's/DOMAINname/'$domain'/' -e 's/CONFname/'$domain'/' -e 's/DomainWWW/'$domainwww'/' -e 's/Email/'$email'/' -e 's/WebServer/'$webserv'/' ~/activateSSL-$domain.sh
 
-echo "Running conf for CMS"
+msg "              Running conf for CMS"
 if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/branch/"$branch"/CMS/"$CMS"/conf.sh; then
     source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/CMS/"$CMS"/conf.sh)
 fi
@@ -239,4 +239,4 @@ systemctl reload fail2ban
 ##-------##
 
 msg "                Added CMS!"
-for f in /etc/update-motd.d/51*; do [ -e "$f" ] && bash /etc/update-motd.d/51*; break; done
\ No newline at end of file
+for f in /etc/update-motd.d/51*; do [ -e "$f" ] && bash /etc/update-motd.d/51*; done
\ No newline at end of file