mirror of
https://github.com/pi-hole/pi-hole.git
synced 2024-11-25 07:33:43 +00:00
pihole status should return (= exit) early on error instead of continuing the script
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
parent
bd9915105a
commit
bcef4f0c97
1 changed files with 4 additions and 3 deletions
7
pihole
7
pihole
|
@ -346,7 +346,7 @@ statusFunc() {
|
||||||
"web") echo "-1";;
|
"web") echo "-1";;
|
||||||
*) echo -e " ${CROSS} DNS service is NOT running";;
|
*) echo -e " ${CROSS} DNS service is NOT running";;
|
||||||
esac
|
esac
|
||||||
return 0
|
exit 0
|
||||||
else
|
else
|
||||||
# get the DNS port pihole-FTL is listening on
|
# get the DNS port pihole-FTL is listening on
|
||||||
port="$(getFTLConfigValue dns.port)"
|
port="$(getFTLConfigValue dns.port)"
|
||||||
|
@ -355,7 +355,7 @@ statusFunc() {
|
||||||
"web") echo "-1";;
|
"web") echo "-1";;
|
||||||
*) echo -e " ${CROSS} DNS service is NOT listening";;
|
*) echo -e " ${CROSS} DNS service is NOT listening";;
|
||||||
esac
|
esac
|
||||||
return 0
|
exit 0
|
||||||
else
|
else
|
||||||
if [[ "${1}" != "web" ]]; then
|
if [[ "${1}" != "web" ]]; then
|
||||||
echo -e " ${TICK} FTL is listening on port ${port}"
|
echo -e " ${TICK} FTL is listening on port ${port}"
|
||||||
|
@ -377,7 +377,8 @@ statusFunc() {
|
||||||
*) echo -e " ${CROSS} Pi-hole blocking is disabled";;
|
*) echo -e " ${CROSS} Pi-hole blocking is disabled";;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
exit 0
|
|
||||||
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
tailFunc() {
|
tailFunc() {
|
||||||
|
|
Loading…
Reference in a new issue