From 35828f9cea495e486e7c7cdbfede230f27bdc1b7 Mon Sep 17 00:00:00 2001
From: Promofaux <adzjwarner@gmail.com>
Date: Sat, 28 Jan 2017 19:05:55 +0000
Subject: [PATCH] Source setupvars earlier in update/repair process

---
 automated install/basic-install.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 053c09d3..d7e51ffc 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -1024,8 +1024,6 @@ accountForRefactor() {
 
 updatePihole() {
   accountForRefactor
-  # Source ${setupVars} for use in the rest of the functions.
-  source ${setupVars}
   # Install base files and web interface
   installScripts
   installConfigs
@@ -1230,7 +1228,10 @@ main() {
     # Clone/Update the repos
     clone_or_update_repos
 
-     # Install packages used by the Pi-hole
+    # Source ${setupVars} for use in the rest of the functions.
+    source ${setupVars}
+
+    # Install packages used by the Pi-hole
     if [[ ${INSTALL_WEB} == true ]]; then
       DEPS=("${PIHOLE_DEPS[@]}" "${PIHOLE_WEB_DEPS[@]}")
     else