Merge remote-tracking branch 'upstream/development' into development

2017-03-23 18:47:50 -04:00
parent ee296f36c1 52baf26d7d
commit 94f15f1b3c
3 changed files with 17 additions and 16 deletions
--- a/advanced/Scripts/update.sh
+++ b/advanced/Scripts/update.sh
@@ -90,6 +90,7 @@ FTLcheckUpdate() {
 main() {
  local pihole_version_current
  local web_version_current
+  source "${setupVars}"

  #This is unlikely
  if ! is_repo "${PI_HOLE_FILES_DIR}" ; then