From 6d02d4056f6abd63ff3d9479979502b6523f715e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Sat, 9 Dec 2023 22:01:30 +0100
Subject: [PATCH] Rename option --admin to --web in version function
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 ++++++++--------
 advanced/bash-completion/pihole |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/advanced/Scripts/version.sh b/advanced/Scripts/version.sh
index e3b4a6ae..2983c04e 100755
--- a/advanced/Scripts/version.sh
+++ b/advanced/Scripts/version.sh
@@ -24,7 +24,7 @@ fi
 getLocalVersion() {
     case ${1} in
         "Pi-hole"   )  echo "${CORE_VERSION:=N/A}";;
-        "web"  )  echo "${WEB_VERSION:=N/A}";;
+        "web"       )  echo "${WEB_VERSION:=N/A}";;
         "FTL"       )  echo "${FTL_VERSION:=N/A}";;
     esac
 }
@@ -32,7 +32,7 @@ getLocalVersion() {
 getLocalHash() {
     case ${1} in
         "Pi-hole"   )  echo "${CORE_HASH:=N/A}";;
-        "web"  )  echo "${WEB_HASH:=N/A}";;
+        "web"       )  echo "${WEB_HASH:=N/A}";;
         "FTL"       )  echo "${FTL_HASH:=N/A}";;
     esac
 }
@@ -40,7 +40,7 @@ getLocalHash() {
 getRemoteHash(){
     case ${1} in
         "Pi-hole"   )  echo "${GITHUB_CORE_HASH:=N/A}";;
-        "web"  )  echo "${GITHUB_WEB_HASH:=N/A}";;
+        "web"       )  echo "${GITHUB_WEB_HASH:=N/A}";;
         "FTL"       )  echo "${GITHUB_FTL_HASH:=N/A}";;
     esac
 }
@@ -48,7 +48,7 @@ getRemoteHash(){
 getRemoteVersion(){
     case ${1} in
         "Pi-hole"   )  echo "${GITHUB_CORE_VERSION:=N/A}";;
-        "web"  )  echo "${GITHUB_WEB_VERSION:=N/A}";;
+        "web"       )  echo "${GITHUB_WEB_VERSION:=N/A}";;
         "FTL"       )  echo "${GITHUB_FTL_VERSION:=N/A}";;
     esac
 }
@@ -56,7 +56,7 @@ getRemoteVersion(){
 getLocalBranch(){
     case ${1} in
         "Pi-hole"   )  echo "${CORE_BRANCH:=N/A}";;
-        "web"  )  echo "${WEB_BRANCH:=N/A}";;
+        "web"       )  echo "${WEB_BRANCH:=N/A}";;
         "FTL"       )  echo "${FTL_BRANCH:=N/A}";;
     esac
 }
@@ -114,11 +114,11 @@ defaultOutput() {
 helpFunc() {
     echo "Usage: pihole -v [repo | option] [option]
 Example: 'pihole -v -p -l'
-Show Pi-hole, Admin Console & FTL versions
+Show Pi-hole, Web Console & FTL versions
 
 Repositories:
   -p, --pihole         Only retrieve info regarding Pi-hole repository
-  -a, --admin          Only retrieve info regarding web repository
+  -w, --web            Only retrieve info regarding web repository
   -f, --ftl            Only retrieve info regarding FTL repository
 
 Options:
@@ -131,7 +131,7 @@ Options:
 
 case "${1}" in
     "-p" | "--pihole"    ) shift; versionOutput "Pi-hole" "$@";;
-    "-a" | "--admin"     ) shift; versionOutput "web" "$@";;
+    "-w" | "--web"       ) shift; versionOutput "web" "$@";;
     "-f" | "--ftl"       ) shift; versionOutput "FTL" "$@";;
     "-h" | "--help"      ) helpFunc;;
     *                    ) defaultOutput "$@";;
diff --git a/advanced/bash-completion/pihole b/advanced/bash-completion/pihole
index b2740724..4fe8f83a 100644
--- a/advanced/bash-completion/pihole
+++ b/advanced/bash-completion/pihole
@@ -35,7 +35,7 @@ _pihole() {
 			COMPREPLY=( $(compgen -W "${opts_update}" -- ${cur}) )
 		;;
 		"version")
-			opts_version="\--admin \--current \--ftl \--hash \--latest \--pihole"
+			opts_version="\--web \--current \--ftl \--hash \--latest \--pihole"
 			COMPREPLY=( $(compgen -W "${opts_version}" -- ${cur}) )
         ;;
 		"core"|"admin"|"ftl")