diff --git a/ct/alpine-gitea.sh b/ct/alpine-gitea.sh index a671f01..36e6e62 100644 --- a/ct/alpine-gitea.sh +++ b/ct/alpine-gitea.sh @@ -25,9 +25,6 @@ function update_script() { $STD apk update && apk upgrade msg_ok "Updated Alpine Packages" - echo "DEBUG: CT_TYPE before update_script=${CT_TYPE:-UNDEFINED}" - echo "DEBUG: var_unprivileged=${var_unprivileged:-UNDEFINED}" - msg_info "Updating Gitea" $STD apk upgrade gitea msg_ok "Updated Gitea" diff --git a/ct/alpine-wireguard.sh b/ct/alpine-wireguard.sh index 3c57cd5..bcfeb35 100644 --- a/ct/alpine-wireguard.sh +++ b/ct/alpine-wireguard.sh @@ -19,6 +19,18 @@ variables color catch_errors + +function update_script() { + UPD=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "SUPPORT" --radiolist --cancel-button Exit-Script "Spacebar = Select" 11 58 1 \ + "1" "Check for Alpine Updates" ON \ + 3>&1 1>&2 2>&3) + + header_info + if [ "$UPD" == "1" ]; then + apk update && apk upgrade + exit + fi +} function update_script() { msg_info "Updating Alpine Packages" apk update && apk upgrade diff --git a/misc/build.func b/misc/build.func index f232926..b7fe9b8 100644 --- a/misc/build.func +++ b/misc/build.func @@ -1356,47 +1356,22 @@ check_container_storage() { } start() { - LOGDIR="/usr/local/community-scripts/logs" - mkdir -p "$LOGDIR" - if [ -f /etc/alpine-release ]; then - echo "Running on Alpine Linux – minimal update process." - update_script - return - fi if command -v pveversion >/dev/null 2>&1; then - if ! (whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then + if ! (whiptail --backtitle "Proxmox VE Helper Scripts" --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then clear - exit_script + echo -e "⚠ User exited script \n" exit fi + SPINNER_PID="" install_script - else - CHOICE=$(whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "${APP} LXC Update/Setting" --menu \ - "Support/Update functions for ${APP} LXC. Choose an option:" \ - 12 60 3 \ - "1" "YES (Silent Mode)" \ - "2" "YES (Verbose Mode)" \ - "3" "NO (Cancel Update)" --nocancel --default-item "1" 3>&1 1>&2 2>&3) + fi - case "$CHOICE" in - 1) - VERB="no" - set_std_mode - log_message "INFO" "Update started (Silent Mode)" - ;; - 2) - VERB="yes" - set_std_mode - log_message "INFO" "Update started (Verbose Mode)" - ;; - 3) + if ! command -v pveversion >/dev/null 2>&1; then + if ! (whiptail --backtitle "Proxmox VE Helper Scripts" --title "${APP} LXC UPDATE" --yesno "Support/Update functions for ${APP} LXC. Proceed?" 10 58); then clear - log_message "INFO" "Update aborted." - exit_script + echo -e "⚠ User exited script \n" exit - ;; - esac - + fi SPINNER_PID="" update_script fi