diff --git a/installer.sh b/installer.sh index 5fdb521..ac957d3 100644 --- a/installer.sh +++ b/installer.sh @@ -50,27 +50,27 @@ fi # Addons # ##----------## -if [ $webserv = Nginx ]; then +if [ $webserv = "Nginx:" ]; then #NGINX Addon menu 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) fi -if [ $webserv = Apache ]; then +if [ $webserv = "Apache:" ]; then #Apache Addon menu 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) fi -if [[ $option == *"Memcached"* ]]; then +if [[ $option == *"Memcached:"* ]]; then #curl -s "$repo"/raw/branch/"$branch"/modules/MODNAME/"$webserv"-aptlist >> /tmp/install.txt echo "Memcached" >> /tmp/install.txt fi -if [[ $option == *"Redis"* ]]; then +if [[ $option == *"Redis:"* ]]; then echo "Redis" >> /tmp/install.txt fi -if [[ $option == *"Brotli"* ]]; then +if [[ $option == *"Brotli:"* ]]; then echo "Brotli" >> /tmp/install.txt fi @@ -80,15 +80,15 @@ fi ##-------## CMS=$(whiptail --nocancel --title "What CMS should be installed?" --radiolist "Features" 11 118 5 "Nextcloud:" "Nextcloud is a suite of client-server software for creating and using file hosting services." OFF "Wordpress:" "WordPress is a content management system based on PHP." OFF "None:" "A plain webserver will be setup." OFF 3>&1 1>&2 2>&3) -if [[ $CMS == "Nextcloud" ]]; then +if [[ $CMS == "Nextcloud:" ]]; then echo "Nextcloud" >> /tmp/install.txt fi -if [[ $CMS == "Wordpress" ]]; then +if [[ $CMS == "Wordpress:" ]]; then echo "Wordpress" >> /tmp/install.txt fi -if [[ $CMS == "None" ]]; then +if [[ $CMS == "None:" ]]; then echo "None" >> /tmp/install.txt fi