From 731d15f9b574eefc6760bb6a3b1e88354705c131 Mon Sep 17 00:00:00 2001 From: Promofaux Date: Sat, 28 Jan 2017 15:43:33 +0000 Subject: [PATCH] don't display web admin info in final dialog if it's not selected --- automated install/basic-install.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 6476f0c6..54020ecb 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -1055,6 +1055,13 @@ checkSelinux() { } displayFinalMessage() { + + if [[ ${INSTALL_WEB} == true ]]; then + additional="View the web interface at http://pi.hole/admin or http://${IPV4_ADDRESS%/*}/admin + +Your Admin Webpage login password is ${1:-"NOT SET"}" + fi + # Final completion message to user whiptail --msgbox --backtitle "Make it so." --title "Installation Complete!" "Configure your devices to use the Pi-hole as their DNS server using: @@ -1064,9 +1071,8 @@ IPv6: ${IPV6_ADDRESS:-"Not Configured"} If you set a new IP address, you should restart the Pi. The install log is in /etc/pihole. -View the web interface at http://pi.hole/admin or http://${IPV4_ADDRESS%/*}/admin -Your Admin Webpage login password is ${1:-"NOT SET"}" ${r} ${c} +${additional}" ${r} ${c} } update_dialogs() {