Merge pull request #1873 from pi-hole/fix/1871

Source setup vars before we attempt to do anything on an update/repair
This commit is contained in:
Adam Warner 2017-12-24 13:21:45 +00:00 committed by GitHub
commit 64df41ed90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2032,12 +2032,12 @@ main() {
# Install and log everything to a file # Install and log everything to a file
installPihole | tee ${tmpLog} installPihole | tee ${tmpLog}
else else
# Source ${setupVars} to use predefined user variables in the functions
source ${setupVars}
# Clone/Update the repos # Clone/Update the repos
clone_or_update_repos clone_or_update_repos
# Source ${setupVars} for use in the rest of the functions
source ${setupVars}
# Install packages used by the Pi-hole # Install packages used by the Pi-hole
if [[ "${INSTALL_WEB}" == true ]]; then if [[ "${INSTALL_WEB}" == true ]]; then
# Install the Web dependencies # Install the Web dependencies