From 8b60bf651f6d7d6e330ffce5431665d313abce5a Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Wed, 22 Apr 2020 14:01:43 +0200 Subject: [PATCH] Update 'installer.sh' --- installer.sh | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/installer.sh b/installer.sh index ee4f793..87d18de 100644 --- a/installer.sh +++ b/installer.sh @@ -229,16 +229,8 @@ fi webserv="${webserv//:}" && webserv="${webserv,,}" #Setting Menulist to webserver -if [[ $webserv = "apache" ]]; then -#Apache Menulist -CMSL=("${ApacheCMSL[@]}") -options=("${ApacheOptions[@]}") -fi -if [[ $webserv = "nginx" ]]; then -#nginx Menulist -CMSL=("${NginxCMSL[@]}") -options=("${NginxOptions[@]}") -fi +declare -n CMSL="$webserv"CMSL +declare -n options="$webserv"Options echo "Generating apt list for Generic" curl --silent --show-error "$repo"/raw/branch/"$branch"/CoreModules/generic/apt.list >>/tmp/apt.list @@ -265,7 +257,7 @@ done ##----------## if [ $IMODE = n ]; then -option=$(whiptail --nocancel --title "Title" --checklist "Features" 11 110 5 "${options[@]}" 3>&1 1>&2 2>&3) +option=$(whiptail --nocancel --title "Additional modules" --checklist "Features" 11 110 5 "${options[@]}" 3>&1 1>&2 2>&3) fi if [ $IMODE = l ]; then choice () {