diff --git a/installer.sh b/installer.sh index fb89f87..c7cd8ed 100644 --- a/installer.sh +++ b/installer.sh @@ -38,6 +38,7 @@ PKGI="${PKGM} install -y --no-install-recommends" # Test-Vars # ##-------------## +syscheckoff=0 if [ $TestMode = 1 ]; then domain=ict-dagbesteding.nl sitename=ict_DB_nl @@ -162,8 +163,8 @@ done # System-Check # ##----------------## -if [[ -d /etc/ICTM ]]; then msg " This system has already been installed by Web-V2" && exit; fi -if [[ ! -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 +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 ##--------------------------##