arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 23:08:07 +00:00
Code Issues Releases Wiki Activity

Prototype whiptails so they don't fall to shell. Need to do this to all functions.

Browse Source
This commit is contained in:
Dan Schaper 2016-10-31 16:55:10 -07:00
parent c07d7165ab
commit 9a1876571b
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
automated install/basic-install.sh
View File

@ -545,8 +545,7 @@ setLogging() {
LogToggleCommand=(whiptail --separate-output --radiolist "Do you want to log queries?\n (Disabling will render graphs on the Admin page useless):" ${r} ${c} 6)
LogChooseOptions=("On (Reccomended)" "" on
Off "" off)
LogChoices=$("${LogToggleCommand[@]}" "${LogChooseOptions[@]}" 2>&1 >/dev/tty)
if [[ $? = 0 ]];then
LogChoices=$("${LogToggleCommand[@]}" "${LogChooseOptions[@]}" 2>&1 >/dev/tty) || (echo "::: Cancel selected. Exiting..." && exit 1)
case ${LogChoices} in
"On (Recommended)")
echo "::: Logging On."
@ -557,11 +556,6 @@ setLogging() {
QUERYLOGGING=false
;;
esac
else
# Well never see this, `set -e` kicked in already and dropped us.
echo "::: Cancel selected. Exiting..."
exit 1
fi
}