From 54e3870b5d02b8e4da0672a3a64f110b9fbab2d1 Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Tue, 21 Mar 2023 22:08:04 -0400
Subject: [PATCH] alpine whiptail menu

---
 ct/alpine-vaultwarden.sh          | 46 +++++++++++--------------------
 install/alpine-adguard-install.sh |  1 +
 2 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/ct/alpine-vaultwarden.sh b/ct/alpine-vaultwarden.sh
index a5df8898..228caeed 100644
--- a/ct/alpine-vaultwarden.sh
+++ b/ct/alpine-vaultwarden.sh
@@ -30,36 +30,22 @@ color
 catch_errors
 
 function update_script() {
-    header_info
-    PS3="Please choose an option from the menu, or enter q to exit: "
-    options=("Update Vaultwarden" "View Admin Token" "Exit")
-    select opt in "${options[@]}"
-    do
-        case $opt in
-            "Update Vaultwarden")
-                clear
-                echo "Updating Vaultwarden..."
-                apk update &>/dev/null
-                apk upgrade &>/dev/null
-                break
-                ;;
-            "View Admin Token")
-                clear
-                echo "Viewing the Admin Token..."
-                token=$(awk -F'"' '/ADMIN_TOKEN/{print $2}' /etc/conf.d/vaultwarden)
-                if [ -n "$token" ]; then
-                    echo "Admin Token: $token"
-                else
-                    echo "Failed to retrieve the Admin Token."
-                fi
-                break
-                ;;
-            "Exit")
-                exit
-                ;;
-            *) echo "Invalid option. Please choose an option from the menu.";;
-        esac
-    done
+UPD=$(whiptail --title "SUPPORT" --radiolist --cancel-button Exit-Script "Spacebar = Select" 11 58 2 \
+  "1" "Update VaultWarden $VAULT" ON \
+  "2" "Show Admin Token" OFF \
+  3>&1 1>&2 2>&3)
+
+header_info
+if [ "$UPD" == "1" ]; then
+apk update && apk upgrade
+exit;
+fi
+
+if [ "$UPD" == "2" ]; then
+  cat /etc/conf.d/vaultwarden | grep "ADMIN_TOKEN" | awk '{print substr($2, 7) }'
+fi
+exit
+fi
 }
 
 start
diff --git a/install/alpine-adguard-install.sh b/install/alpine-adguard-install.sh
index 07cfd3e7..9105f9df 100644
--- a/install/alpine-adguard-install.sh
+++ b/install/alpine-adguard-install.sh
@@ -14,6 +14,7 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
+$STD apk add newt
 $STD apk add wget
 $STD apk add bash
 $STD apk add curl