v5.14.2 (#5040)

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

advanced/Scripts/piholeDebug.sh

@@ -314,9 +314,9 @@ check_ftl_version() {
     local FTL_VERSION FTL_COMMIT FTL_BRANCH
     echo_current_diagnostic "FTL version"
     # Use the built in command to check FTL's version
-    FTL_VERSION=$(pihole-FTL -vv | grep -m 1 Version | awk '{printf $2}')
-    FTL_BRANCH=$(pihole-FTL -vv | grep -m 1 Branch | awk '{printf $2}')
-    FTL_COMMIT=$(pihole-FTL -vv | grep -m 1 Commit | awk '{printf $2}')
+    FTL_VERSION=$(pihole-FTL version)
+    FTL_BRANCH=$(pihole-FTL branch)
+    FTL_COMMIT=$(pihole-FTL --hash)
 
 
     log_write "${TICK} Version: ${FTL_VERSION}"

advanced/Scripts/updatecheck.sh

@@ -17,12 +17,12 @@ function get_local_branch() {
 function get_local_version() {
     # Return active version
     cd "${1}" 2> /dev/null || return 1
-    git describe --long --dirty --tags 2> /dev/null || return 1
+    git describe --tags --always 2> /dev/null || return 1
 }
 
 function get_local_hash() {
     cd "${1}" 2> /dev/null || return 1
-    git rev-parse --short HEAD || return 1
+    git rev-parse --short=8 HEAD || return 1
 }
 
 function get_remote_version() {
@@ -31,7 +31,7 @@ function get_remote_version() {
 
 
 function get_remote_hash(){
-    git ls-remote "https://github.com/pi-hole/${1}" --tags "${2}" | awk '{print substr($0, 0,9);}' || return 1
+    git ls-remote "https://github.com/pi-hole/${1}" --tags "${2}" | awk '{print substr($0, 0,8);}' || return 1
 }
 
 # Source the setupvars config file
@@ -113,7 +113,7 @@ addOrEditKeyValPair "${VERSION_FILE}" "FTL_VERSION" "${FTL_VERSION}"
 FTL_BRANCH="$(pihole-FTL branch)"
 addOrEditKeyValPair "${VERSION_FILE}" "FTL_BRANCH" "${FTL_BRANCH}"
 
-FTL_HASH="$(pihole-FTL -v | cut -d "-" -f2)"
+FTL_HASH="$(pihole-FTL --hash)"
 addOrEditKeyValPair "${VERSION_FILE}" "FTL_HASH" "${FTL_HASH}"
 
 GITHUB_FTL_VERSION="$(get_remote_version FTL)"

advanced/Scripts/version.sh

@@ -77,18 +77,27 @@ versionOutput() {
         [ "$3" = "-c" ] || [ "$3" = "--current" ] || [ -z "$3" ] && curHash=$(getLocalHash "${1}") && branch=$(getLocalBranch "${1}")
         [ "$3" = "-l" ] || [ "$3" = "--latest" ] || [ -z "$3" ] && latHash=$(getRemoteHash "${1}") && branch=$(getLocalBranch "${1}")
     fi
+
+    # We do not want to show the branch name when we are on master,
+    # blank out the variable in this case
+    if [ "$branch" = "master" ]; then
+        branch=""
+    else
+        branch="$branch "
+    fi
+
     if [ -n "$current" ] && [ -n "$latest" ]; then
-        output="${1} version is $branch $current (Latest: $latest)"
+        output="${1} version is $branch$current (Latest: $latest)"
     elif [ -n "$current" ] && [ -z "$latest" ]; then
-        output="Current ${1} version is $branch $current"
+        output="Current ${1} version is $branch$current"
     elif [ -z "$current" ] && [ -n "$latest" ]; then
         output="Latest ${1} version is $latest"
     elif [ -n "$curHash" ] && [ -n "$latHash" ]; then
-        output="Local ${1} hash of branch $branch is $curHash (Remote: $latHash)"
+        output="Local ${1} hash is $curHash (Remote: $latHash)"
     elif [ -n "$curHash" ] && [ -z "$latHash" ]; then
-        output="Current local ${1} hash of branch $branch is $curHash"
+        output="Current local ${1} hash is $curHash"
     elif [ -z "$curHash" ] && [ -n "$latHash" ]; then
-        output="Latest remote ${1} hash of branch $branch is $latHash"
+        output="Latest remote ${1} hash is $latHash"
     elif [ -z "$curHash" ] && [ -z "$latHash" ]; then
         output="Hashes for ${1} not available"
     else

automated install/basic-install.sh

@@ -360,7 +360,7 @@ package_manager_detect() {
         # CentOS package manager returns 100 when there are packages to update so we need to || true to prevent the script from exiting.
         PKG_COUNT="${PKG_MANAGER} check-update | grep -E '(.i686|.x86|.noarch|.arm|.src)' | wc -l || true"
         OS_CHECK_DEPS=(grep bind-utils)
-        INSTALLER_DEPS=(git dialog iproute newt procps-ng which chkconfig ca-certificates)
+        INSTALLER_DEPS=(git dialog iproute newt procps-ng chkconfig ca-certificates)
         PIHOLE_DEPS=(cronie curl findutils sudo unzip libidn2 psmisc libcap nmap-ncat jq)
         PIHOLE_WEB_DEPS=(lighttpd lighttpd-fastcgi php-common php-cli php-pdo php-xml php-json php-intl)
         LIGHTTPD_USER="lighttpd"

pihole

@@ -553,7 +553,7 @@ case "${1}" in
   "restartdns"                  ) restartDNS "$2";;
   "-a" | "admin"                ) webpageFunc "$@";;
   "checkout"                    ) piholeCheckoutFunc "$@";;
-  "updatechecker"               ) updateCheckFunc "$@";;
+  "updatechecker"               ) shift; updateCheckFunc "$@";;
   "arpflush"                    ) arpFunc "$@";;
   "-t" | "tail"                 ) tailFunc "$2";;
 esac