From f51b50debb4b1d360c0d7a50367bd7319c04b433 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Wed, 2 Dec 2020 15:25:45 +0100
Subject: [PATCH] added debug msg to preconfig

---
 CoreModules/generic/preconf.sh | 2 ++
 installer.sh                   | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CoreModules/generic/preconf.sh b/CoreModules/generic/preconf.sh
index 01433af..861644e 100644
--- a/CoreModules/generic/preconf.sh
+++ b/CoreModules/generic/preconf.sh
@@ -1,3 +1,4 @@
+echo "DEBUG Start preconf"
 if [ "$osrel" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] || [ "$osrel" = "deb10" ] ; then
 ########################
 #    Debian/Ubunbtu    #
@@ -35,6 +36,7 @@ elif [ "$osrel" = "cent8" ]; then
 ################
 #    Centos    #
 ################
+echo "DEBUG running cent8 preconf"
     ##--------------##
     #  Repositories  #
     ##--------------##
diff --git a/installer.sh b/installer.sh
index 6e916b6..de58f1f 100644
--- a/installer.sh
+++ b/installer.sh
@@ -195,7 +195,8 @@ done
 ##----------------##
 
 if [[ "$syscheckoff" -ne 1 ]] && [[ -d /etc/ICTM ]]; then msg "             This system has already been installed by Web-V2" && exit; fi
-if [[ "$syscheckoff" -ne 1 ]] && [[ ! -z $(dpkg -l | cut -d " " -f 3 | grep "^mysql-server") || ! -z $(dpkg -l | cut -d " " -f 3 | grep "nginx") || ! -z $(dpkg -l | cut -d " " -f 3 | grep "apache") || ! -z $(dpkg -l | cut -d " " -f 3 | grep "php") ]] ; then msg " This system has installed packages, Web-V2 is designed for clean systems" && exit; fi
+##Check for pkgs, not yet setup for Centos
+# if [[ "$syscheckoff" -ne 1 ]] && [[ ! -z $(dpkg -l | cut -d " " -f 3 | grep "^mysql-server") || ! -z $(dpkg -l | cut -d " " -f 3 | grep "nginx") || ! -z $(dpkg -l | cut -d " " -f 3 | grep "apache") || ! -z $(dpkg -l | cut -d " " -f 3 | grep "php") ]] ; then msg " This system has installed packages, Web-V2 is designed for clean systems" && exit; fi
 
 
 ##--------------------------##
@@ -464,7 +465,7 @@ for val1 in ${option[*]}; do
            printf " " >>/tmp/pkg.list
         fi
         if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$modListed""$PKGLIST".pkg.list; then
-           curl --retry 7 --retry-delay 5 -s "$modListed""$PKGLIST" >>/tmp/pkg.list
+           curl --retry 7 --retry-delay 5 -s "$modListed""$PKGLIST".pkg.list >>/tmp/pkg.list
            printf " " >>/tmp/pkg.list
         fi
         if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$modListed""$webserv"-"$PKGLIST".pkg.list; then