mirror of
https://github.com/community-scripts/ProxmoxVE.git
synced 2026-04-18 16:32:17 +00:00
remove whiptail from update scripts for unattended update support (#11712)
* Simplify Alpine update scripts to run upgrade Remove interactive whiptail menus, loops and newt dependency checks from ct/alpine-docker.sh, ct/alpine-zigbee2mqtt.sh, and ct/alpine.sh. Each update_script now simply calls header_info, runs $STD apk -U upgrade, displays a success message and exits, simplifying and automating the update flow. * feat(update-scripts): replace whiptail with msg_menu for unattended updates Remove all whiptail dialogs from ct update_script() functions and replace with msg_menu() - a lightweight read-based menu that supports: - PHS_SILENT=1: auto-selects first (default) option for unattended mode - Interactive: numbered menu with 10s timeout and default fallback Converted scripts (whiptail menu → msg_menu): - plex.sh, npmplus.sh, cronicle.sh, meilisearch.sh, node-red.sh - homeassistant.sh, podman-homeassistant.sh - vaultwarden.sh, alpine-vaultwarden.sh - loki.sh, alpine-loki.sh - alpine-grafana.sh, alpine-redis.sh, alpine-valkey.sh - alpine-nextcloud.sh Simplified scripts (removed unnecessary whiptail for single-action updates): - alpine.sh, alpine-docker.sh, alpine-zigbee2mqtt.sh Special handling: - gitea-mirror.sh: replaced yesno/msgbox with read -rp confirmations, exit 75 in silent mode for major version upgrades requiring interaction - vaultwarden.sh/alpine-vaultwarden.sh: passwordbox replaced with read -r -s -p, skipped in silent mode with warning - nginxproxymanager.sh: exit 1 → exit 75 for disabled script Infrastructure: - Added msg_menu() helper to misc/build.func - Added exit code 75 handling in update-apps.sh (skip, not fail) Closes #11620 * refactor(update-scripts): remove menus where sequential updates suffice - alpine-nextcloud: add apk upgrade as the update action (was missing) - meilisearch: run meilisearch + UI updates sequentially (like bar-assistant) - npmplus: run alpine upgrade + docker pull sequentially, no menu - vaultwarden: update VaultWarden + Web-Vault sequentially, remove admin token option (interactive-only, not suitable for unattended updates) - alpine-vaultwarden: just run apk upgrade, remove admin token menu
This commit is contained in:
committed by
GitHub
parent
c29dfa7a29
commit
7715a02f05
@@ -20,45 +20,38 @@ color
|
||||
catch_errors
|
||||
|
||||
function update_script() {
|
||||
if ! apk -e info newt >/dev/null 2>&1; then
|
||||
apk add -q newt
|
||||
fi
|
||||
while true; do
|
||||
CHOICE=$(
|
||||
whiptail --backtitle "Proxmox VE Helper Scripts" --title "SUPPORT" --menu "Select option" 11 58 2 \
|
||||
"1" "Update Vaultwarden" \
|
||||
"2" "Reset ADMIN_TOKEN" 3>&2 2>&1 1>&3
|
||||
)
|
||||
exit_status=$?
|
||||
if [ $exit_status == 1 ]; then
|
||||
clear
|
||||
exit-script
|
||||
CHOICE=$(msg_menu "Vaultwarden Update Options" \
|
||||
"1" "Update Vaultwarden" \
|
||||
"2" "Reset ADMIN_TOKEN")
|
||||
|
||||
case $CHOICE in
|
||||
1)
|
||||
$STD apk -U upgrade
|
||||
rc-service vaultwarden restart -q
|
||||
msg_ok "Updated successfully!"
|
||||
exit
|
||||
;;
|
||||
2)
|
||||
if [[ "${PHS_SILENT:-0}" == "1" ]]; then
|
||||
msg_warn "Reset ADMIN_TOKEN requires interactive mode, skipping."
|
||||
exit
|
||||
fi
|
||||
header_info
|
||||
case $CHOICE in
|
||||
1)
|
||||
$STD apk -U upgrade
|
||||
rc-service vaultwarden restart -q
|
||||
msg_ok "Updated successfully!"
|
||||
exit
|
||||
;;
|
||||
2)
|
||||
if NEWTOKEN=$(whiptail --backtitle "Proxmox VE Helper Scripts" --passwordbox "Setup your ADMIN_TOKEN (make it strong)" 10 58 3>&1 1>&2 2>&3); then
|
||||
if [[ -z "$NEWTOKEN" ]]; then exit-script; fi
|
||||
if ! command -v argon2 >/dev/null 2>&1; then apk add argon2 &>/dev/null; fi
|
||||
TOKEN=$(echo -n "${NEWTOKEN}" | argon2 "$(openssl rand -base64 32)" -e -id -k 19456 -t 2 -p 1)
|
||||
if [[ ! -f /var/lib/vaultwarden/config.json ]]; then
|
||||
sed -i "s|export ADMIN_TOKEN=.*|export ADMIN_TOKEN='${TOKEN}'|" /etc/conf.d/vaultwarden
|
||||
else
|
||||
sed -i "s|\"admin_token\": .*|\"admin_token\": \"${TOKEN}\",|" /var/lib/vaultwarden/config.json
|
||||
fi
|
||||
rc-service vaultwarden restart -q
|
||||
read -r -s -p "Setup your ADMIN_TOKEN (make it strong): " NEWTOKEN
|
||||
echo ""
|
||||
if [[ -n "$NEWTOKEN" ]]; then
|
||||
if ! command -v argon2 >/dev/null 2>&1; then apk add argon2 &>/dev/null; fi
|
||||
TOKEN=$(echo -n "${NEWTOKEN}" | argon2 "$(openssl rand -base64 32)" -e -id -k 19456 -t 2 -p 1)
|
||||
if [[ ! -f /var/lib/vaultwarden/config.json ]]; then
|
||||
sed -i "s|export ADMIN_TOKEN=.*|export ADMIN_TOKEN='${TOKEN}'|" /etc/conf.d/vaultwarden
|
||||
else
|
||||
sed -i "s|\"admin_token\": .*|\"admin_token\": \"${TOKEN}\",|" /var/lib/vaultwarden/config.json
|
||||
fi
|
||||
clear
|
||||
exit
|
||||
;;
|
||||
esac
|
||||
done
|
||||
rc-service vaultwarden restart -q
|
||||
msg_ok "Admin token updated"
|
||||
fi
|
||||
exit
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
start
|
||||
|
||||
Reference in New Issue
Block a user