From 7750e1344ce5d482a1bd2d4f1e9fdba18d95af1f Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Sun, 1 Jan 2017 07:10:14 -0800 Subject: [PATCH] DRY `displayFinalMessage` Signed-off-by: Dan Schaper --- automated install/basic-install.sh | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index c1265c17..c501452d 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -966,29 +966,18 @@ checkSelinux() { } displayFinalMessage() { - if (( ${#1} > 0 )) ; then # 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: IPv4: ${IPV4_ADDRESS%/*} -IPv6: ${IPV6_ADDRESS} +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 -The currently set password is ${1}" ${r} ${c} - else - whiptail --msgbox --backtitle "Make it so." --title "Installation Complete!" "Configure your devices to use the Pi-hole as their DNS server using: -IPv4: ${IPV4_ADDRESS%/*} -IPv6: ${IPV6_ADDRESS} - -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" ${r} ${c} - fi +Your Admin Webpage login password is ${1:-"NOT SET"}" ${r} ${c} } update_dialogs() {