Merge pull request #2116 from pi-hole/FTLDNS_UpdateCheck

Check for new updates without actually updating

advanced/Scripts/update.sh

@@ -19,6 +19,9 @@ readonly PI_HOLE_FILES_DIR="/etc/.pihole"
 # shellcheck disable=SC2034
 PH_TEST=true
 
+# when --check-only is passed to this script, it will not perform the actual update
+CHECK_ONLY=false
+
 # shellcheck disable=SC1090
 source "${PI_HOLE_FILES_DIR}/automated install/basic-install.sh"
 # shellcheck disable=SC1091
@@ -140,6 +143,11 @@ main() {
     exit 0
   fi
 
+  if [[ "${CHECK_ONLY}" == true ]]; then
+    echo ""
+    exit 0
+  fi
+
   if [[ "${core_update}" == true ]]; then
     echo ""
     echo -e "  ${INFO} Pi-hole core files out of date, updating local repo."
@@ -159,7 +167,7 @@ main() {
     echo -e "  ${INFO} FTL out of date, it will be updated by the installer."
   fi
 
-  if [[ "${FTL_update}" == true || "${core_update}" == true || "${web_update}" == true ]]; then
+  if [[ "${FTL_update}" == true || "${core_update}" == true ]]; then
     ${PI_HOLE_FILES_DIR}/automated\ install/basic-install.sh --reconfigure --unattended || \
          echo -e "${basicError}" && exit 1
   fi
@@ -167,4 +175,8 @@ main() {
   exit 0
 }
 
+if [[ "$1" == "--check-only" ]]; then
+  CHECK_ONLY=true
+fi
+
 main

pihole

@@ -71,7 +71,8 @@ flushFunc() {
 }
 
 updatePiholeFunc() {
-  "${PI_HOLE_SCRIPT_DIR}"/update.sh
+  shift
+  "${PI_HOLE_SCRIPT_DIR}"/update.sh "$@"
   exit 0
 }
 
@@ -620,6 +621,7 @@ Options:
   -q, query           Query the adlists for a specified domain
                         Add '-h' for more info on query usage
   -up, updatePihole   Update Pi-hole subsystems
+                        Add '--check-only' to exit script before update is performed.
   -v, version         Show installed versions of Pi-hole, Admin Console & FTL
                         Add '-h' for more info on version usage
   uninstall           Uninstall Pi-hole from your system
@@ -644,7 +646,7 @@ case "${1}" in
   "-wild" | "wildcard"          ) wildcardFunc "$@";;
   "-d" | "debug"                ) debugFunc "$@";;
   "-f" | "flush"                ) flushFunc "$@";;
-  "-up" | "updatePihole"        ) updatePiholeFunc;;
+  "-up" | "updatePihole"        ) updatePiholeFunc "$@";;
   "-r"  | "reconfigure"         ) reconfigurePiholeFunc;;
   "-g" | "updateGravity"        ) updateGravityFunc "$@";;
   "-c" | "chronometer"          ) chronometerFunc "$@";;