From e946a35b181fb3fb51f772b0dc14eb2b546630ca Mon Sep 17 00:00:00 2001
From: Adam Warner <adamw@rner.email>
Date: Mon, 30 Apr 2018 23:50:35 +0100
Subject: [PATCH] Move dnsmasq check into FTLcheckUpdate

Signed-off-by: Adam Warner <adamw@rner.email>
---
 automated install/basic-install.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 7fa8bf6e..57878e9a 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -1971,6 +1971,11 @@ FTLcheckUpdate()
   local remoteSha1
   local localSha1
 
+   # if dnsmasq is running at this point, force reinstall of FTL Binary
+  if check_service_active "dnsmasq";then
+    return 1
+  fi
+
   if [[ ! "${ftlBranch}" == "master" ]]; then
     if [[ ${ftlLoc} ]]; then
       # We already have a pihole-FTL binary downloaded.
@@ -2022,11 +2027,6 @@ FTLdetect() {
   echo ""
   echo -e "  ${INFO} FTL Checks..."
 
-  # if dnsmasq is running at this point, force reinstall of FTL Binary
-  if check_service_active "dnsmasq";then
-    FTLinstall "${binary}" || return 1
-  fi
-
   if FTLcheckUpdate ; then
     FTLinstall "${binary}" || return 1
   fi