From f950882ffdfe17b1798af03af67c466f7388fc33 Mon Sep 17 00:00:00 2001 From: MacRimi Date: Sat, 18 Apr 2026 18:20:57 +0200 Subject: [PATCH 1/3] Update beta_version.txt --- beta_version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beta_version.txt b/beta_version.txt index 867e5243..02e184e7 100644 --- a/beta_version.txt +++ b/beta_version.txt @@ -1 +1 @@ -1.2.0 \ No newline at end of file +1.1.9.5 \ No newline at end of file From 2fb9e74a135fc88b362e8d8b2d6ccaba9de14d0a Mon Sep 17 00:00:00 2001 From: MacRimi Date: Sat, 18 Apr 2026 18:48:33 +0200 Subject: [PATCH 2/3] Update menu --- menu | 35 ++++++----------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/menu b/menu index c0e6001c..a4ce9f38 100644 --- a/menu +++ b/menu @@ -85,37 +85,14 @@ check_updates_stable() { } # ── Beta-mode update check (main + develop) ─────────────── -# When the beta program is active, check BOTH channels: -# 1. main → prompt if a newer stable is available -# 2. develop → prompt if a newer beta build is available -# Stable check runs first. Declining it falls through to the beta check. +# When the beta program is active, check BOTH channels. The stable check +# is delegated to check_updates_stable (same prompt, same installer). After +# that we only need the beta-specific part: develop vs beta_version.txt. check_updates_beta() { - # ── 1. Stable release on main ── - if [[ -f "$LOCAL_VERSION_FILE" ]]; then - local REMOTE_STABLE LOCAL_STABLE - REMOTE_STABLE="$(curl -fsSL "$REPO_MAIN/version.txt" 2>/dev/null | head -n 1)" - LOCAL_STABLE="$(head -n 1 "$LOCAL_VERSION_FILE" 2>/dev/null)" + # 1. Stable release on main — reuse the non-beta path. + check_updates_stable - if [[ -n "$REMOTE_STABLE" && -n "$LOCAL_STABLE" && "$LOCAL_STABLE" != "$REMOTE_STABLE" ]] && \ - [[ "$(printf '%s\n%s\n' "$LOCAL_STABLE" "$REMOTE_STABLE" | sort -V | tail -1)" = "$REMOTE_STABLE" ]]; then - - if whiptail --title "$(translate 'Update Available')" \ - --yesno "$(translate 'New version available') ($REMOTE_STABLE)\n\n$(translate 'Do you want to update now?')" \ - 10 60 --defaultno; then - - msg_warn "$(translate 'Starting ProxMenux update...')" - - local INSTALL_STABLE_SCRIPT="$BASE_DIR/install_proxmenux.sh" - if curl -fsSL "$REPO_MAIN/install_proxmenux.sh" -o "$INSTALL_STABLE_SCRIPT"; then - chmod +x "$INSTALL_STABLE_SCRIPT" - bash "$INSTALL_STABLE_SCRIPT" --update - return 0 - fi - fi - fi - fi - - # ── 2. Beta build on develop ── + # 2. Beta build on develop. [[ ! -f "$BETA_VERSION_FILE" ]] && return 0 local REMOTE_BETA LOCAL_BETA From a5a55f3c7da1cde162c264dc124eec9d67382dc8 Mon Sep 17 00:00:00 2001 From: MacRimi Date: Sat, 18 Apr 2026 18:50:29 +0200 Subject: [PATCH 3/3] Delete beta_version.txt --- beta_version.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 beta_version.txt diff --git a/beta_version.txt b/beta_version.txt deleted file mode 100644 index 02e184e7..00000000 --- a/beta_version.txt +++ /dev/null @@ -1 +0,0 @@ -1.1.9.5 \ No newline at end of file