From 7a5d2485ef3a36a310dd8bb6c54e2812f1081310 Mon Sep 17 00:00:00 2001
From: bprieshof <bprieshof@noreply@ictmaatwerk.com>
Date: Thu, 28 Nov 2019 14:28:47 +0100
Subject: [PATCH] Removed old code and fixed typo

---
 installer.sh | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/installer.sh b/installer.sh
index 8d00300..60d36ca 100644
--- a/installer.sh
+++ b/installer.sh
@@ -101,16 +101,11 @@ webserv="${webserv//:}" && webserv="${webserv,,}"
 
 curl "$repo"/raw/branch/"$branch"/CoreModules/"$webserv"/apt.list >>/tmp/apt.list
 
-if [[ $webserv == "Apache:" ]]; then
-echo "apache2 php-pear libapache2-mod-php php${phpver}-mysql php${phpver}-cgi php${phpver}-common php${phpver}-mbstring php${phpver}-curl php${phpver}-gd php${phpver}-intl php${phpver}-soap php${phpver}-xml php${phpver}-xmlrpc php${phpver}-zip" >> /tmp/install.txt
-fi
-
-
 ##----------##
 #   Addons   #
 ##----------##
 
-if [[ $webserv = "Nginx:" ]]; then
+if [[ $webserv = "nginx" ]]; then
 #NGINX Addon menu
 if [ $IMODE = n ]; then
 option=$(whiptail --nocancel --title "Which Nginx addons should be installed?" --checklist "Features" 11 110 5 "Memcached:" "Memcached is an open source, high-performance, distributed memory caching system." OFF "Redis Cache:" "Redis is an open source BSD licensed, in-memory data structure store." OFF 3>&1 1>&2 2>&3)
@@ -154,7 +149,7 @@ done
 fi
 fi
 
-if [[ $webserv = "Apache:" ]]; then
+if [[ $webserv = "apache" ]]; then
 #Apache Addon menu
 if [ $IMODE = n ]; then
 option=$(whiptail --nocancel --title "Which Apache addons should be installed?" --checklist "Features" 11 110 5 "Memcached:" "Memcached is an open source, high-performance, distributed memory caching system." OFF "Redis Cache:" "Redis is an open source BSD licensed, in-memory data structure store." OFF 3>&1 1>&2 2>&3)
@@ -241,19 +236,6 @@ curl "$repo"/raw/branch/"$branch"/CMS/"$CMS"/$webserv/apt.list >>/tmp/apt.list
 
 curl "$repo"/raw/branch/"$branch"/CMS/"$CMS"/apt.list >>/tmp/apt.list
 
-if [[ $CMS == "Nextcloud:" ]]; then
-echo "libxml2 openssl zlib1g libpng-dev redis-server" >> /tmp/install.txt
-fi
-
-if [[ $CMS == "Wordpress:" ]]; then
-echo "" >> /tmp/install.txt
-fi
-
-if [[ $CMS == "None:" ]]; then
-echo "" >> /tmp/install.txt
-fi
-
-
 ##--------------------##
 #   Pre-Requirements   #
 ##--------------------##