From 0cb3113ede3e95424feda8b026c4508ad2afab30 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Fri, 9 Oct 2020 15:09:58 +0200
Subject: [PATCH] Output cleanup for whiptail

---
 AppendCMS.sh               | 1 +
 AppendModule.sh            | 7 +++----
 CoreModules/apache/conf.sh | 2 +-
 installer.sh               | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/AppendCMS.sh b/AppendCMS.sh
index c5d472b..231a4d7 100644
--- a/AppendCMS.sh
+++ b/AppendCMS.sh
@@ -152,6 +152,7 @@ CMS="${CMS//:}" && CMS="${CMS,,}"
 ##-----------##
 #   AptList   #
 ##-----------##
+msg "        Generating apt list for CMS"
 
 if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/generic.pkg.list; then
     curl -s "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/generic.pkg.list >>/tmp/pkg.list
diff --git a/AppendModule.sh b/AppendModule.sh
index a5c03e4..c011fe6 100644
--- a/AppendModule.sh
+++ b/AppendModule.sh
@@ -85,7 +85,7 @@ fi
 
 if [ $IMODE = n ]; then
 	PasswordQuest
-	option=$(whiptail --title "Title" --checklist "Features" 11 110 5 "${options[@]}" 3>&1 1>&2 2>&3)
+	option=$(whiptail --title "Config" --checklist "Features" 11 110 5 "${options[@]}" 3>&1 1>&2 2>&3)
 	[[ "$?" = 1 ]] && msg "              Quiting installer" 8 78 && exit;
 fi
 
@@ -150,7 +150,6 @@ option="$option""$aonoption"
 
 msg "        Generating apt list for Options"
 for val1 in ${option[*]}; do
-    echo "$val1" #TMP
     modListed=$(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/extModules.list|grep "$val1")
     #Checking
     if test -z "$modListed"
@@ -200,7 +199,7 @@ done
 
 msg "          Running preconf for Options"
 for val1 in ${option[*]}; do
-    echo "$val1" #TMP
+    msg "Pre-configuring  $val1"
     modListed=$(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/extModules.list|grep "$val1")
     #Checking
     if test -z "$modListed"
@@ -239,7 +238,7 @@ cat /tmp/pkg.list | xargs $PKGI
 
 msg "            Running conf for Options"
 for val1 in ${option[*]}; do
-    echo "$val1" #TMP
+    msg "Configuring  $val1"
     modListed=$(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/extModules.list|grep "$val1")
     #Checking
     if test -z "$modListed" 
diff --git a/CoreModules/apache/conf.sh b/CoreModules/apache/conf.sh
index e0e521f..c3f67f6 100644
--- a/CoreModules/apache/conf.sh
+++ b/CoreModules/apache/conf.sh
@@ -45,7 +45,7 @@ sed -i -e 's/DOMAINname/'$hostname'/g' /etc/apache2/sites-available/Backend_ssl.
 
 
 mkdir -p /opt/toggle
-curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/toggles/toggle-PhpMyAdmin_APACHE.sh -O  /opt/toggle/toggle-PhpMyAdmin.sh
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/toggles/toggle-PhpMyAdmin_APACHE.sh -o /opt/toggle/toggle-PhpMyAdmin.sh
 
 
 # custom Welcome page
diff --git a/installer.sh b/installer.sh
index 60d419f..068fe0d 100644
--- a/installer.sh
+++ b/installer.sh
@@ -649,7 +649,7 @@ if [ $sslenable = 1 ]; then
         rm -rf /etc/acmesh/certs/$domain*
     fi
     unset certsatus
-    /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$hostname"
+    /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$hostname" > $OUTPUT 2>&1
     certsatusBackend=$?
 
     if test $certsatusBackend -eq 0