From 39510bbd1ff9351fe93a674d7dc97419957b755a Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Fri, 9 Oct 2020 12:18:48 +0200
Subject: [PATCH] Output cleanup normal and bug fixes

---
 AppendCMS.sh                   | 18 +++++++++---------
 CMS/nextcloud/conf.sh          |  2 +-
 CoreModules/generic/preconf.sh |  6 +++---
 installer.sh                   | 26 +++++++++++++-------------
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/AppendCMS.sh b/AppendCMS.sh
index d4ce7e8..c5d472b 100644
--- a/AppendCMS.sh
+++ b/AppendCMS.sh
@@ -7,7 +7,7 @@ if [ ! -f "/etc/ICTM/selopts.list" ] || [ ! -f "/etc/ICTM/mainvar.list" ] ; then
 
 source /etc/ICTM/selopts.list
 source /etc/ICTM/mainvar.list
-rm /tmp/pkg.list
+rm /tmp/pkg.list > $OUTPUT 2>&1
 source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/ModulesMenu.list)
 
 #Setting Menulist to webserver
@@ -153,21 +153,21 @@ CMS="${CMS//:}" && CMS="${CMS,,}"
 #   AptList   #
 ##-----------##
 
-if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/generic.pkg.list >>/tmp/pkg.list; then
-    curl "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/generic.pkg.list >>/tmp/pkg.list
+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
     printf " " >>/tmp/pkg.list
 fi
-if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$PKGLIST".pkg.list >>/tmp/pkg.list; then
-    curl "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$PKGLIST".pkg.list >>/tmp/pkg.list
+if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$PKGLIST".pkg.list; then
+    curl -s "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$PKGLIST".pkg.list >>/tmp/pkg.list
     printf " " >>/tmp/pkg.list
 fi
 
 if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-generic.pkg.list; then
-    curl "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-generic.pkg.list >>/tmp/pkg.list
+    curl -s "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-generic.pkg.list >>/tmp/pkg.list
     printf " " >>/tmp/pkg.list
 fi
 if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-"$PKGLIST".pkg.list; then
-    curl "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-"$PKGLIST".pkg.list >>/tmp/pkg.list
+    curl -s "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-"$PKGLIST".pkg.list >>/tmp/pkg.list
     printf " " >>/tmp/pkg.list
 fi
 
@@ -218,10 +218,10 @@ msg "                Setting up SSL"
     fi
     site_ext=ssl
     if [ $domainwww = 1 ]; then
-        /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$domain" -d "www.$domain"
+        /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$domain" -d "www.$domain" > $OUTPUT 2>&1
         certsatus=$?
     elif [ $domainwww = 0 ]; then
-        /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$domain"
+        /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$domain" > $OUTPUT 2>&1
         certsatus=$?
     fi
     if test $certsatus -eq 0
diff --git a/CMS/nextcloud/conf.sh b/CMS/nextcloud/conf.sh
index f0e98e8..9927359 100644
--- a/CMS/nextcloud/conf.sh
+++ b/CMS/nextcloud/conf.sh
@@ -9,7 +9,7 @@ mkdir -p /var/www/"$domain"/html/data
 curl --retry 7 --retry-delay 5 -s http://mirror.nxdi.nl/resources/nextcloud/latest.tar.bz2 -o /tmp/nextcloud.tar.bz2
 tar jxf /tmp/nextcloud.tar.bz2 -C /tmp
 cp -a /tmp/nextcloud/. /var/www/"$domain"/html
-touch /var/www/"$domain"/html/data/nextcloud.log
+touch /var/www/"$domain"/html/data/nextcloud.log > $OUTPUT 2>&1
 
 #Creating DB
 db_suffix=`expr $(ls -l /var/www | grep -c ^d) - 1`
diff --git a/CoreModules/generic/preconf.sh b/CoreModules/generic/preconf.sh
index 8506a7a..f1e28b5 100644
--- a/CoreModules/generic/preconf.sh
+++ b/CoreModules/generic/preconf.sh
@@ -25,9 +25,9 @@ $PKGM upgrade -y
 ##------------##
 
 hostnamectl set-hostname $hostname
-sed -i 's/;preserve_hostname: false/preserve_hostname: true/g' /etc/cloud/cloud.cfg
-timedatectl set-timezone Europe/Amsterdam
-sed -i -e '/Port 22/c\Port 4242' -e 's/PermitRootLogin yes/PermitRootLogin prohibit-password/g' /etc/ssh/sshd_config
+sed -i 's/;preserve_hostname: false/preserve_hostname: true/g' /etc/cloud/cloud.cfg > $OUTPUT 2>&1
+timedatectl set-timezone Europe/Amsterdam > $OUTPUT 2>&1
+sed -i -e '/Port 22/c\Port 4242' -e 's/PermitRootLogin yes/PermitRootLogin prohibit-password/g' /etc/ssh/sshd_config > $OUTPUT 2>&1
 
 
 ##----------##
diff --git a/installer.sh b/installer.sh
index c9887fb..1fb38c3 100644
--- a/installer.sh
+++ b/installer.sh
@@ -176,7 +176,7 @@ if (whiptail --title "Config" --yesno "                          Hostname with n
     hostname=$(whiptail --nocancel --inputbox "                      SystemID (eg: VCH001) without ".nxdi.nl"     " 11 82 --title "Config" 3>&1 1>&2 2>&3)
     hostname=$hostname".nxdi.nl"
 else
-    hostname=$(whiptail --nocancel --inputbox "                              Hostname" 11 78 --title "Config" 3>&1 1>&2 2>&3)
+    hostname=$(whiptail --nocancel --inputbox "                                 Hostname" 11 78 --title "Config" 3>&1 1>&2 2>&3)
 fi
 }
 
@@ -257,9 +257,9 @@ fi
 PasswordQuest
 email=$(whiptail --nocancel --inputbox "                     Enter the administrator e-mail" 11 78 --title "Config" 3>&1 1>&2 2>&3)
 fi
-webserv=$(whiptail --title "Select Webserver" --radiolist "WebServer" 11 53 5  "${webservers[@]}" 3>&1 1>&2 2>&3)
+webserv=$(whiptail --title "Select Webserver" --radiolist "WebServer" 11 74 5  "${webservers[@]}" 3>&1 1>&2 2>&3)
 esws=$?
-[[ "$esws" = 1 ]] && msg "              Quiting installer" 8 78 && exit;
+[[ "$esws" = 1 ]] && msg "              Quiting installer" && exit;
 fi
 
 if [ $IMODE = l ]; then
@@ -376,7 +376,7 @@ touch /etc/ICTM/sites/"$sitename"
 ##----------##
 ##DisableOPtionMenu
 if [ $IMODE = n ]; then
-option=$(whiptail --nocancel --title "Additional modules" --checklist "Features" 11 110 5 "${options[@]}" 3>&1 1>&2 2>&3)
+option=$(whiptail --nocancel --title "Additional modules" --checklist "Features" 11 74 5 "${options[@]}" 3>&1 1>&2 2>&3)
 fi
 if [ $IMODE = l ]; then
 choice () {
@@ -504,20 +504,20 @@ fi
 CMS="${CMS//:}" && CMS="${CMS,,}"
 
 #Generating APT-List CMS
-if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/generic.pkg.list >>/tmp/pkg.list; then
-   curl "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/generic.pkg.list >>/tmp/pkg.list
+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
    printf " " >>/tmp/pkg.list
 fi
 if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-generic.pkg.list; then
- curl "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-generic.pkg.list >>/tmp/pkg.list
+ curl -s "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-generic.pkg.list >>/tmp/pkg.list
  printf " " >>/tmp/pkg.list
 fi
-if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/generic.pkg.list >>/tmp/pkg.list; then
-   curl "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$PKGLIST".pkg.list >>/tmp/pkg.list
+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"/"$PKGLIST".pkg.list >>/tmp/pkg.list
    printf " " >>/tmp/pkg.list
 fi
 if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-"$PKGLIST".pkg.list; then
- curl "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-"$PKGLIST".pkg.list >>/tmp/pkg.list
+ curl -s "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/"$webserv"-"$PKGLIST".pkg.list >>/tmp/pkg.list
  printf " " >>/tmp/pkg.list
 fi
 
@@ -598,7 +598,7 @@ fi
 
 #Configuring Options
 for val1 in ${option[*]}; do
-    msg " Configuring  $val1"
+    msg "Configuring  $val1"
     modListed=$(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/extModules.list|grep "$val1")
     #Checking
     if test -z "$modListed" 
@@ -630,10 +630,10 @@ if [ $sslenable = 1 ]; then
         certwebserv=$webserv
     fi
     if [ $domainwww = 1 ]; then
-        /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$domain" -d "www.$domain"
+        /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$domain" -d "www.$domain" > $OUTPUT 2>&1
         certsatus=$?
     elif [ $domainwww = 0 ]; then
-        /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$domain"
+        /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$domain" > $OUTPUT 2>&1
         certsatus=$?
     fi
     if test $certsatus -eq 0