Refine output of password status in basic-install.sh:displayFinalMessage(). Fixes #1488 (#1490)

This commit is contained in:
DL6ER 2017-05-23 10:44:11 +02:00 committed by GitHub
parent 2ef87ad110
commit 3035c9a366

View file

@ -1129,10 +1129,18 @@ checkSelinux() {
displayFinalMessage() {
if [[ ${#1} -gt 0 ]] ; then
pwstring="$1"
elif [[ $(grep 'WEBPASSWORD' -c /etc/pihole/setupVars.conf) -gt 0 ]]; then
pwstring="unchanged"
else
pwstring="NOT SET"
fi
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"}"
Your Admin Webpage login password is ${pwstring}"
fi
# Final completion message to user