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

Carriage return or newline based webcalls.

Browse Source 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
This commit is contained in:
Dan Schaper 2017-02-27 11:03:57 -08:00
parent 38961fb31b
commit 83b0600863
No known key found for this signature in database
GPG Key ID: 572E999E385B7BFC
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
advanced/Scripts/piholeDebug.sh
View File

@ -332,11 +332,17 @@ debugLighttpd() {
} }
countdown() { countdown() {
local tuvix
tuvix=${TIMEOUT} tuvix=${TIMEOUT}
printf "::: Logging will automatically teminate in ${TIMEOUT} seconds\n" printf "::: Logging will automatically teminate in %s seconds\n" "${TIMEOUT}"
while [ $tuvix -ge 1 ] while [ $tuvix -ge 1 ]
do do
printf ":::\t${tuvix} seconds left. \r" printf ":::\t%s seconds left. " "${tuvix}"
if [[ -z "${WEBCALL}" ]]; then
printf "\r"
else
printf "\n"
fi
sleep 5 sleep 5
tuvix=$(( tuvix - 5 )) tuvix=$(( tuvix - 5 ))
done done

9
pihole
View File

@ -46,11 +46,18 @@ wildcardFunc() {
debugFunc() { debugFunc() {
local automated local automated
local web
# Pull off the `debug` leaving passed call augmentation flags in $1
shift shift
if [[ "${1}" == "-a" ]]; then if [[ "${1}" == "-a" ]]; then
automated="true" automated="true"
fi fi
AUTOMATED=${automated:-} "${PI_HOLE_SCRIPT_DIR}"/piholeDebug.sh if [[ "${2}" == "-w" ]]; then
web="true"
fi
AUTOMATED=${automated:-} WEBCALL=${web:-} "${PI_HOLE_SCRIPT_DIR}"/piholeDebug.sh
exit 0 exit 0
} }