Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 02:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace nc with psuedo-device

Browse source 
* Also fix minor conditional style issue
This commit is contained in:
WaLLy3K 2017-08-31 20:32:02 +10:00 committed by GitHub
parent 3125d24ded
commit 15a5f425bf
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pihole
View file

@ -485,9 +485,11 @@ Options:
statusFunc() {
local addnConfigs
# Determine if service is running on port 53
if nc -z 127.0.0.1 53; then
[[ "${1}" != "web" ]] && echo -e " ${TICK} DNS service is running"
# Determine if service is running on port 53 (Cr: https://superuser.com/a/806331)
if (echo > /dev/tcp/localhost/53) >/dev/null 2>&1; then
if [[ "${1}" != "web" ]]; then
echo -e " ${TICK} DNS service is running"
fi
else
case "${1}" in
"web") echo "-1";;
@ -496,7 +498,7 @@ statusFunc() {
return 0
fi
# Determine if any of Pi-hole's addn-hosts configs are commented out
# Determine if Pi-hole's addn-hosts configs are commented out
addnConfigs=$(grep -i "addn-hosts=/" /etc/dnsmasq.d/01-pihole.conf)
if [[ "${addnConfigs}" =~ "#" ]]; then
@ -562,7 +564,7 @@ tricorderFunc() {
exit 1
fi
if ! timeout 2 nc -z tricorder.pi-hole.net 9998 &> /dev/null; then
if ! (echo > /dev/tcp/tricorder.pi-hole.net/9998) >/dev/null 2>&1; then
echo -e " ${CROSS} Unable to connect to Pi-hole's Tricorder server"
exit 1
fi