diff --git a/setup.sh b/setup.sh index a0ae720..e777e2a 100644 --- a/setup.sh +++ b/setup.sh @@ -45,9 +45,10 @@ case ${answer:0:1} in ${SUDO} sh -c 'echo "deb https://download.webmin.com/download/repository sarge contrib" > /etc/apt/sources.list.d/webmin.list' wget https://download.webmin.com/jcameron-key.asc ${SUDO} sudo gpg --dearmor jcameron-key.asc + ${SUDO} sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys d97a3ae911f63c51 rm jcameron-key.asc ${SUDO} apt update && ${SUDO} apt install webmin && WEBMIN=1 - pause + read -p "Press any key to continue" ;; * ) echo -e Webmin "${BOLDRED} NOT${ENDCOLOR}" installed @@ -60,7 +61,7 @@ case ${answer:0:1} in cd "Pi-hole/automated install/" bash basic-install.sh pihole -a -p - pause + read -p "Press any key to continue" ;; * ) echo -e PiHole "${BOLDRED} NOT${ENDCOLOR} " installed @@ -76,11 +77,11 @@ if [[ $WEBMIN != 0 ]] ${SUDO} ln -s /etc/letsencrypt/live/$HOSTNAME/combined.pem /etc/webmin/miniserv.pem ${SUDO} systemctl start webmin else - echo No + #echo No fi if [[ -d "/etc/lighttpd" ]] then - read -p "Request let\'s encrypt certificate for lighttpd(y/n)" answer + read -p "Request let's encrypt certificate for lighttpd(y/n)" answer case ${answer:0:1} in y|Y ) echo -e "${ITALICGREEN}Stopping lighttpd${ENDCOLOR}" @@ -108,5 +109,5 @@ if [[ -d "/etc/lighttpd" ]] ;; esac else - echo No + #echo No fi \ No newline at end of file