From c3c31a1a60dcf68ae3b08a2c474485fdbd3c9cb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Sat, 9 Dec 2023 23:09:58 +0100
Subject: [PATCH] Print version details automatically if not on master
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christian König <ckoenig@posteo.de>
---
 advanced/Scripts/version.sh | 16 ++++++++--------
 pihole                      |  5 ++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/advanced/Scripts/version.sh b/advanced/Scripts/version.sh
index ff7f0815..2422ea6d 100755
--- a/advanced/Scripts/version.sh
+++ b/advanced/Scripts/version.sh
@@ -27,7 +27,13 @@ fi
 
 main() {
     local details
-    details=$1
+    details=false
+
+    # Automatically show detailed information if
+    # at least one of the components is not on master branch
+    if [ ! "${CORE_BRANCH}" = "master" ] || [ ! "${WEB_BRANCH}" = "master" ] || [ ! "${FTL_BRANCH}" = "master" ] ; then
+        details=true
+    fi
 
     if [ "${details}" = true ]; then
         echo "Core"
@@ -49,10 +55,4 @@ main() {
     fi
 }
 
-# Process options (if present)
-case "$1" in
-    "-vv"      ) details=true;;
-    *          ) details=false;;
-esac
-
-main "${details}"
+main
diff --git a/pihole b/pihole
index ef93146c..7c84771c 100755
--- a/pihole
+++ b/pihole
@@ -140,7 +140,7 @@ uninstallFunc() {
 }
 
 versionFunc() {
-  exec "${PI_HOLE_SCRIPT_DIR}"/version.sh "$@"
+  exec "${PI_HOLE_SCRIPT_DIR}"/version.sh
 }
 
 restartDNS() {
@@ -507,7 +507,6 @@ Options:
   -up, updatePihole   Update Pi-hole subsystems
                         Add '--check-only' to exit script before update is performed.
   -v, version         Show installed versions of Pi-hole, Web Interface & FTL
-                        Use -vv for detailed information.
   uninstall           Uninstall Pi-hole from your system
   status              Display the running status of Pi-hole subsystems
   enable              Enable Pi-hole subsystems
@@ -530,7 +529,7 @@ fi
 need_root=1
 case "${1}" in
   "-h" | "help" | "--help"      ) helpFunc;;
-  "-v" | "-vv" | "version"      ) versionFunc "$@";;
+  "-v" | "version"              ) versionFunc;;
   "-c" | "chronometer"          ) chronometerFunc "$@";;
   "-q" | "query"                ) queryFunc "$@";;
   "status"                      ) statusFunc "$2";;