arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2025-01-03 04:30:55 +00:00
Code Issues Releases Wiki Activity

Review comments

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2018-08-14 09:55:16 +02:00
parent 165affc39b
commit 0ebd68f17f
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pihole
View File

@ -203,7 +203,7 @@ Time:
if [[ -e "${gravitylist}.bck" ]]; then if [[ -e "${gravitylist}.bck" ]]; then
mv "${gravitylist}.bck" "${gravitylist}" mv "${gravitylist}.bck" "${gravitylist}"
fi fi
if [[ -e "${blacklist}" ]]; then if [[ -e "${blacklist}.bck" ]]; then
mv "${blacklist}.bck" "${blacklist}" mv "${blacklist}.bck" "${blacklist}"
fi fi
sed -i "/BLOCKING_ENABLED=/d" "${setupVars}" sed -i "/BLOCKING_ENABLED=/d" "${setupVars}"
@ -253,8 +253,6 @@ Options:
} }
statusFunc() { statusFunc() {
local addnConfigs
# Determine if service is running on port 53 (Cr: https://superuser.com/a/806331) # Determine if service is running on port 53 (Cr: https://superuser.com/a/806331)
if (echo > /dev/tcp/127.0.0.1/53) >/dev/null 2>&1; then if (echo > /dev/tcp/127.0.0.1/53) >/dev/null 2>&1; then
if [[ "${1}" != "web" ]]; then if [[ "${1}" != "web" ]]; then
@ -269,9 +267,6 @@ statusFunc() {
fi fi
# Determine if Pi-hole's blocking is enabled # Determine if Pi-hole's blocking is enabled
addnConfigs=$?
if grep -q "BLOCKING_ENABLED=false" /etc/pihole/setupVars.conf; then if grep -q "BLOCKING_ENABLED=false" /etc/pihole/setupVars.conf; then
# A config is commented out # A config is commented out
case "${1}" in case "${1}" in