From a2404f104a2ab430c20ea4841cd935e9ec25f3d0 Mon Sep 17 00:00:00 2001
From: Dan Schaper <dan.schaper@pi-hole.net>
Date: Sat, 11 Mar 2017 12:21:15 -0800
Subject: [PATCH] Just some style and linting. And a `cd` in
 `fetch_checkout_pull_branch`

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
---
 advanced/Scripts/piholeCheckout.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/advanced/Scripts/piholeCheckout.sh b/advanced/Scripts/piholeCheckout.sh
index 25874744..fe46d413 100644
--- a/advanced/Scripts/piholeCheckout.sh
+++ b/advanced/Scripts/piholeCheckout.sh
@@ -19,7 +19,7 @@ PH_TEST="true" source "${PI_HOLE_FILES_DIR}/automated install/basic-install.sh"
 
 source "${setupVars}"
 
-update=false
+update="false"
 
 fully_fetch_repo() {
   # Add upstream branches to shallow clone
@@ -52,6 +52,7 @@ fetch_checkout_pull_branch() {
   local branch="${2}"
 
   # Set the reference for the requested branch, fetch, check it put and pull it
+  cd "${directory}"
   git remote set-branches origin "${branch}" || return 1
   git fetch --quiet || return 1
   checkout_pull_branch "${directory}" "${branch}" || return 1
@@ -61,15 +62,16 @@ checkout_pull_branch() {
   # Check out specified branch
   local directory="${1}"
   local branch="${2}"
+  local oldbranch
 
   cd "${directory}" || return 1
 
-  local oldbranch="$(git symbolic-ref HEAD)"
+  oldbranch="$(git symbolic-ref HEAD)"
 
   git checkout "${branch}" || return 1
 
   if [ "$(git diff "${oldbranch}" | grep -c "^")" -gt "0" ]; then
-    update=true
+    update="true"
   fi
 
   git pull || return 1
@@ -106,7 +108,7 @@ checkout()
     echo "::: Please re-run install script from https://github.com/pi-hole/pi-hole"
     exit 1;
   fi
-  if [[ ${INSTALL_WEB} == true ]]; then
+  if [[ ${INSTALL_WEB} == "true" ]]; then
     if ! is_repo "${webInterfaceDir}" ; then
       echo "::: Critical Error: Web Admin repo is missing from system!"
       echo "::: Please re-run install script from https://github.com/pi-hole/pi-hole"
@@ -130,7 +132,7 @@ checkout()
     echo "::: Shortcut \"dev\" detected - checking out development / devel branches ..."
     echo "::: Pi-hole core"
     fetch_checkout_pull_branch "${PI_HOLE_FILES_DIR}" "development" || { echo "Unable to pull Core developement branch"; exit 1; }
-    if [[ ${INSTALL_WEB} == true ]]; then
+    if [[ ${INSTALL_WEB} == "true" ]]; then
       echo "::: Web interface"
       fetch_checkout_pull_branch "${webInterfaceDir}" "devel" || { echo "Unable to pull Web development branch"; exit 1; }
     fi
@@ -140,7 +142,7 @@ checkout()
     echo "::: Shortcut \"master\" detected - checking out master branches ..."
     echo "::: Pi-hole core"
     fetch_checkout_pull_branch "${PI_HOLE_FILES_DIR}" "master" || { echo "Unable to pull Core master branch"; exit 1; }
-    if [[ ${INSTALL_WEB} == true ]]; then
+    if [[ ${INSTALL_WEB} == "true" ]]; then
       echo "::: Web interface"
       fetch_checkout_pull_branch "${webInterfaceDir}" "master" || { echo "Unable to pull web master branch"; exit 1; }
     fi
@@ -163,7 +165,7 @@ checkout()
       exit 1
     fi
     checkout_pull_branch "${PI_HOLE_FILES_DIR}" "${2}"
-  elif [[ "${1}" == "web" && ${INSTALL_WEB} == true ]] ; then
+  elif [[ "${1}" == "web" && "${INSTALL_WEB}" == "true" ]] ; then
     echo -n "::: Fetching remote branches for the web interface from ${webInterfaceGitUrl} ... "
     if ! fully_fetch_repo "${webInterfaceDir}" ; then
       echo "::: Fetching all branches for Pi-hole web interface repo failed!"
@@ -187,7 +189,7 @@ checkout()
   fi
 
   # Force updating everything
-  if [[ ! "${1}" == "web" && ${update} ]]; then
+  if [[ ! "${1}" == "web" && "${update}" ]]; then
     echo "::: Running installer to upgrade your installation"
     if "${PI_HOLE_FILES_DIR}/automated install/basic-install.sh" --unattended; then
      exit 0