From f5541860bc16b96bf9f8121657d4c054d43c42d5 Mon Sep 17 00:00:00 2001
From: Adam Warner <adamw@rner.email>
Date: Sat, 2 Jun 2018 09:56:08 +0100
Subject: [PATCH] Don't run the installer when doing ftl checkout, instead just
 run the ftl install functions

Signed-off-by: Adam Warner <adamw@rner.email>
---
 advanced/Scripts/piholeCheckout.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/advanced/Scripts/piholeCheckout.sh b/advanced/Scripts/piholeCheckout.sh
index 65bb5b7a..5125a2b4 100644
--- a/advanced/Scripts/piholeCheckout.sh
+++ b/advanced/Scripts/piholeCheckout.sh
@@ -166,6 +166,9 @@ checkout() {
     if check_download_exists "$path"; then
         echo "  ${TICK} Branch ${2} exists"
         echo "${2}" > /etc/pihole/ftlbranch
+        FTLinstall "${binary}"
+        start_service pihole-FTL
+        enable_service pihole-FTL
     else
         echo "  ${CROSS} Requested branch \"${2}\" is not available"
         ftlbranches=( $(git ls-remote https://github.com/pi-hole/ftl | grep 'heads' | sed 's/refs\/heads\///;s/ //g' | awk '{print $2}') )
@@ -180,7 +183,7 @@ checkout() {
   fi
 
   # Force updating everything
-  if [[  ! "${1}" == "web"  ]]; then
+  if [[  ! "${1}" == "web" && ! "${1}" == "ftl" ]]; then
     echo -e "  ${INFO} Running installer to upgrade your installation"
     if "${PI_HOLE_FILES_DIR}/automated install/basic-install.sh" --unattended; then
       exit 0