From b85af50d14381dc7eab4e0688af44baba8fd7f3d Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sat, 4 Mar 2017 14:08:11 +0100
Subject: Generate only the information that is actually asked for

---
 advanced/Scripts/version.sh | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'advanced/Scripts/version.sh')

diff --git a/advanced/Scripts/version.sh b/advanced/Scripts/version.sh
index 68e84900..5674bce1 100755
--- a/advanced/Scripts/version.sh
+++ b/advanced/Scripts/version.sh
@@ -86,18 +86,18 @@ normalOutput() {
 
 webOutput() {
   case "${1}" in
-    "-l" | "--latest"    ) echo "${WEBVERSIONLATEST}";;
-    "-c" | "--current"   ) echo "${WEBVERSION}";;
-    "-h" | "--hash"      ) echo "${WEBHASH}";;
+    "-l" | "--latest"    ) echo $(getRemoteVersion AdminLTE);;
+    "-c" | "--current"   ) echo $(getLocalVersion "${WEBGITDIR}");;
+    "-h" | "--hash"      ) echo $(getLocalHash "${WEBGITDIR}");;
     *                    ) echo "::: Invalid Option!"; exit 1;
   esac
 }
 
 coreOutput() {
   case "${1}" in
-    "-l" | "--latest"    ) echo "${PHVERSIONLATEST}";;
-    "-c" | "--current"   ) echo "${PHVERSION}";;
-    "-h" | "--hash"      ) echo "${PHHASH}";;
+    "-l" | "--latest"    ) echo $(getRemoteVersion pi-hole);;
+    "-c" | "--current"   ) echo $(getLocalVersion "${PHGITDIR}");;
+    "-h" | "--hash"      ) echo $(getLocalHash "${PHGITDIR}");;
     *                    ) echo "::: Invalid Option!"; exit 1;
   esac
 }
@@ -120,13 +120,6 @@ EOM
 	exit 0
 }
 
-PHVERSION=$(getLocalVersion "${PHGITDIR}")
-PHHASH=$(getLocalHash "${PHGITDIR}")
-PHVERSIONLATEST=$(getRemoteVersion pi-hole)
-WEBVERSION=$(getLocalVersion "${WEBGITDIR}")
-WEBHASH=$(getLocalHash "${WEBGITDIR}")
-WEBVERSIONLATEST=$(getRemoteVersion AdminLTE)
-
 if [[ $# = 0 ]]; then
 	normalOutput
 fi
-- 
cgit v1.2.3