From cdbe4c9b861d3a2daa92593cfe093d95379877b9 Mon Sep 17 00:00:00 2001
From: Adam Warner <me@adamwarner.co.uk>
Date: Mon, 14 Nov 2022 20:39:34 +0000
Subject: [PATCH 1/2] Get only the precise tag number when getting local
 version, do not show branch name when on master branch(es)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
---
 advanced/Scripts/updatecheck.sh |  2 +-
 advanced/Scripts/version.sh     | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/advanced/Scripts/updatecheck.sh b/advanced/Scripts/updatecheck.sh
index 938be6cd..6a5324c7 100755
--- a/advanced/Scripts/updatecheck.sh
+++ b/advanced/Scripts/updatecheck.sh
@@ -17,7 +17,7 @@ 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() {
diff --git a/advanced/Scripts/version.sh b/advanced/Scripts/version.sh
index 5c74fa05..946c69fe 100755
--- a/advanced/Scripts/version.sh
+++ b/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

From ba74051502dd64b8bccc1f4ec1d74587202d902f Mon Sep 17 00:00:00 2001
From: Adam Warner <me@adamwarner.co.uk>
Date: Mon, 14 Nov 2022 22:09:26 +0000
Subject: [PATCH 2/2] Grab local FTL hash correctly from FTL's own version
 output, and grab one digit less for remote hashes (also in debug log)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
---
 advanced/Scripts/piholeDebug.sh | 6 +++---
 advanced/Scripts/updatecheck.sh | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/advanced/Scripts/piholeDebug.sh b/advanced/Scripts/piholeDebug.sh
index 7ad92412..3cd782bf 100755
--- a/advanced/Scripts/piholeDebug.sh
+++ b/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}"
diff --git a/advanced/Scripts/updatecheck.sh b/advanced/Scripts/updatecheck.sh
index 6a5324c7..0ce9ad5d 100755
--- a/advanced/Scripts/updatecheck.sh
+++ b/advanced/Scripts/updatecheck.sh
@@ -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)"