From 337cc5ca187118e87c0200cede812a2c8f3239d7 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Mon, 13 Aug 2018 17:22:10 +0200
Subject: [PATCH] BLOCKING -> BLOCKING_ENABLED

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 gravity.sh |  2 +-
 pihole     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gravity.sh b/gravity.sh
index 3ccd5a5d..b5694b76 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -78,7 +78,7 @@ fi
 #  gravity.list.bck and black.list.bck instead of
 #  gravity.list and black.list
 detect_pihole_blocking_status() {
-  if [[ "${BLOCKING}" == false ]]; then
+  if [[ "${BLOCKING_ENABLED}" == false ]]; then
     echo -e "  ${INFO} Pi-hole blocking is disabled"
     adList="${adList}.bck"
     blackList="${blackList}.bck"
diff --git a/pihole b/pihole
index 2fcdbfbb..b4e4b0b8 100755
--- a/pihole
+++ b/pihole
@@ -192,8 +192,8 @@ Time:
       fi
 
       local str="Pi-hole Disabled"
-      sed -i "/BLOCKING=/d" "${setupVars}"
-      echo "BLOCKING=false" >> "${setupVars}"
+      sed -i "/BLOCKING_ENABLED=/d" "${setupVars}"
+      echo "BLOCKING_ENABLED=false" >> "${setupVars}"
     fi
   else
     # Enable Pi-hole
@@ -206,8 +206,8 @@ Time:
     if [[ -e "${blacklist}" ]]; then
       mv "${blacklist}.bck" "${blacklist}"
     fi
-    sed -i "/BLOCKING=/d" "${setupVars}"
-    echo "BLOCKING=true" >> "${setupVars}"
+    sed -i "/BLOCKING_ENABLED=/d" "${setupVars}"
+    echo "BLOCKING_ENABLED=true" >> "${setupVars}"
   fi
 
   restartDNS reload
@@ -272,13 +272,13 @@ statusFunc() {
 
   addnConfigs=$?
 
-  if grep -q "BLOCKING=false" /etc/pihole/setupVars.conf; then
+  if grep -q "BLOCKING_ENABLED=false" /etc/pihole/setupVars.conf; then
     # A config is commented out
     case "${1}" in
       "web") echo 0;;
       *) echo -e "  ${CROSS} Pi-hole blocking is Disabled";;
     esac
-  elif grep -q "BLOCKING=true" /etc/pihole/setupVars.conf;  then
+  elif grep -q "BLOCKING_ENABLED=true" /etc/pihole/setupVars.conf;  then
     # Configs are set
     case "${1}" in
       "web") echo 1;;