Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-28 17:13:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cancel now exists on chooseWebServerOptions.

Browse source 
Improved dialogues and comments.
This commit is contained in:
ryt51V 2016-02-28 09:19:57 +00:00
parent 3cf2406045
commit f5080337a0
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
automated install/basic-install.sh
View file

@ -306,10 +306,14 @@ setStaticIPv4() {
function chooseWebServer() { function chooseWebServer() {
# Allow the user to choose the web server they wish to use. # Allow the user to choose the web server they wish to use.
chooseWebServerCmd=(whiptail --separate-output --radiolist "pi-hole will automatically configure the lighttpd web server for you. Alternatively, if you prefer, pi-hole can use a web server that you have previously manually configured yourself.\n\n(If you are unsure, choose lighttpd.)" $r $c 2) chooseWebServerCmd=(whiptail --separate-output --radiolist "Pi-hole will automatically configure the lighttpd web server for you. Alternatively, if you prefer, pi-hole can use a web server that you have previously manually configured yourself.\n\n(If you are unsure, choose lighttpd.)" $r $c 2)
chooseWebServerOptions=(lighttpd "" on chooseWebServerOptions=(lighttpd "" on
Manual "" off) Manual "" off)
webServer=$("${chooseWebServerCmd[@]}" "${chooseWebServerOptions[@]}" 2>&1 >/dev/tty) webServer=$("${chooseWebServerCmd[@]}" "${chooseWebServerOptions[@]}" 2>&1 >/dev/tty)
if [[ ! ($? = 0) ]]; then
echo "::: Cancel selected, exiting...."
exit 1
fi
case $webServer in case $webServer in
lighttpd) lighttpd)
echo "::: Using lighttpd web server." echo "::: Using lighttpd web server."
@ -317,7 +321,7 @@ function chooseWebServer() {
;; ;;
Manual) Manual)
echo "::: Using manual web server configuration." echo "::: Using manual web server configuration."
webRoot=$(whiptail --backtitle "Web Root" --title "Web Root" --inputbox "Enter the root path of the website you have manually configured for the pi-hole." $r $c "/var/www/html" 3>&1 1>&2 2>&3) webRoot=$(whiptail --backtitle "Web Root" --title "Web Root" --inputbox "Enter the root path of the website you have manually configured for Pi-hole." $r $c "/var/www/html" 3>&1 1>&2 2>&3)
;; ;;
esac esac
webInterfaceDir="${webRoot}/admin" webInterfaceDir="${webRoot}/admin"
@ -560,6 +564,7 @@ checkForDependencies() {
echo "::: Checking dependencies:" echo "::: Checking dependencies:"
dependencies=( dnsutils bc toilet figlet dnsmasq php5-common php5-cgi php5 git curl unzip wget ) dependencies=( dnsutils bc toilet figlet dnsmasq php5-common php5-cgi php5 git curl unzip wget )
# Add lighttpd to the list if required.
if [[ "$webServer" = "lighttpd" ]] if [[ "$webServer" = "lighttpd" ]]
then then
dependencies=( "${dependencies[@]}" "lighttpd" ) dependencies=( "${dependencies[@]}" "lighttpd" )