Cherry picking f6f6f6d, conflict fix

8 years ago · 3df2ef8587
parent 354309fcad
commit 3df2ef8587
1 changed files with 13 additions and 12 deletions
--- a/install/basic-install.sh
+++ b/install/basic-install.sh
@ -932,18 +932,19 @@ accountForRefactor() {
 }

 updatePihole() {
-    accountForRefactor
-	# Source ${setupVars} for use in the rest of the functions.
-	. ${setupVars}
-	# Install base files and web interface
-	installScripts
-	installConfigs
-	CreateLogFile
-	configureSelinux
-	installPiholeWeb
-	installCron
-	configureFirewall
-	runGravity
+  accountForRefactor
+  # Source ${setupVars} for use in the rest of the functions.
+  . ${setupVars}
+  # Install base files and web interface
+  installScripts
+  installConfigs
+  CreateLogFile
+  configureSelinux
+  installPiholeWeb
+  installCron
+  configureFirewall
+  finalExports #re-export setupVars.conf to account for any new vars added in new versions
+  runGravity
 }

 configureSelinux() {