mirror of
https://github.com/MacRimi/ProxMenux.git
synced 2026-06-03 21:54:42 +00:00
7cea5563a7
The installer fix in this PR rewrites the systemd unit on every v1.2.2.x update, which catches every user once they accept the update prompt. But the prompt in `menu` uses `--defaultno` so a user who presses Enter by reflex stays on the broken state and opens a fresh issue, which is the scenario unfolding in #222. Add a tiny `auto_repair_monitor_unit` function that runs before `check_updates` on every menu launch. It only touches anything when the bug's exact fingerprint is present: 1. /etc/systemd/system/proxmenux-monitor.service exists 2. Its ExecStart points at /usr/local/share/proxmenux/ProxMenux-Monitor.AppImage 3. The extracted AppRun is already on disk at /usr/local/share/proxmenux/monitor-app/AppRun When all three are true the function rewrites the unit, reloads systemd, restarts the service, and logs a single msg_ok line. For healthy installs and for hosts that never had the Monitor at all, it returns immediately without touching anything — safe to ship unconditionally. Verified on .55 by simulating the broken unit (ExecStart on the bare AppImage → 203/EXEC + activating loop) and running the new menu script: unit rewritten to AppRun, service active, single "ProxMenux Monitor unit repaired and restarted" line printed. CHANGELOG entries (EN+ES) updated to mention the auto-repair so users on the broken state know the simpler recovery is now "just run menu". Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
197 lines
8.0 KiB
Bash
197 lines
8.0 KiB
Bash
#!/bin/bash
|
|
|
|
# ==========================================================
|
|
# ProxMenux - A menu-driven script for Proxmox VE management
|
|
# ==========================================================
|
|
# Author : MacRimi
|
|
# Copyright : (c) 2024-2025 MacRimi
|
|
# License : GPL-3.0 (https://github.com/MacRimi/ProxMenux/blob/main/LICENSE)
|
|
# Version : 1.2
|
|
# Last Updated: 18/03/2026
|
|
# ==========================================================
|
|
# Description:
|
|
# Main entry point for ProxMenux.
|
|
# - Loads configuration and utility functions.
|
|
# - Detects if running in Beta Program mode (develop branch).
|
|
# - Checks for updates from the appropriate branch (main or develop).
|
|
# - In beta mode: compares beta_version.txt; notifies when a stable
|
|
# release is available and prompts the user to switch.
|
|
# - Launches the main menu.
|
|
# ==========================================================
|
|
|
|
# ── Configuration ──────────────────────────────────────────
|
|
BASE_DIR="/usr/local/share/proxmenux"
|
|
LOCAL_SCRIPTS="$BASE_DIR/scripts"
|
|
CONFIG_FILE="$BASE_DIR/config.json"
|
|
CACHE_FILE="$BASE_DIR/cache.json"
|
|
UTILS_FILE="$BASE_DIR/utils.sh"
|
|
LOCAL_VERSION_FILE="$BASE_DIR/version.txt"
|
|
BETA_VERSION_FILE="$BASE_DIR/beta_version.txt"
|
|
VENV_PATH="/opt/googletrans-env"
|
|
|
|
REPO_MAIN="https://raw.githubusercontent.com/MacRimi/ProxMenux/main"
|
|
REPO_DEVELOP="https://raw.githubusercontent.com/MacRimi/ProxMenux/develop"
|
|
|
|
# ── Load utilities ─────────────────────────────────────────
|
|
[[ -f "$UTILS_FILE" ]] && source "$UTILS_FILE"
|
|
|
|
: "${LOCAL_SCRIPTS:=/usr/local/share/proxmenux/scripts}"
|
|
|
|
# ── Detect beta mode ───────────────────────────────────────
|
|
# Returns 0 (true) if this install is part of the beta program.
|
|
is_beta() {
|
|
[[ -f "$CONFIG_FILE" ]] || return 1
|
|
local beta_flag
|
|
beta_flag=$(jq -r '.beta_program.status // empty' "$CONFIG_FILE" 2>/dev/null)
|
|
[[ "$beta_flag" == "active" ]]
|
|
}
|
|
|
|
# ── Recover broken Monitor unit before anything else ──────
|
|
#
|
|
# v1.2.2 changed the AppImage layout: the binary is extracted to
|
|
# /usr/local/share/proxmenux/monitor-app/ and the systemd unit
|
|
# executes AppRun out of that directory. The install_proxmenux.sh
|
|
# update path before v1.2.2.1 only rewrote the unit on fresh installs,
|
|
# so every user updating from v1.2.1 stable inherited the old unit
|
|
# whose ExecStart still pointed at the bare AppImage. On PVE 9.x /
|
|
# Debian 13 that bare AppImage hits status=203/EXEC immediately and
|
|
# the service enters the activating loop reported in #222.
|
|
#
|
|
# Re-running the new installer fixes it permanently, but the update
|
|
# prompt below uses --defaultno so a user pressing Enter by reflex
|
|
# stays broken. Patch the unit defensively at every menu launch: if
|
|
# the bug's exact fingerprint is present (unit ExecStart matches the
|
|
# bare AppImage path AND the extracted AppRun already exists) we
|
|
# silently rewrite the unit and bounce the service. The check is a
|
|
# no-op for healthy installs and for hosts that never installed the
|
|
# Monitor at all, so it's safe to run unconditionally.
|
|
auto_repair_monitor_unit() {
|
|
local unit_file="/etc/systemd/system/proxmenux-monitor.service"
|
|
local extracted_runtime="/usr/local/share/proxmenux/monitor-app"
|
|
local apprun="$extracted_runtime/AppRun"
|
|
local bare_appimage="/usr/local/share/proxmenux/ProxMenux-Monitor.AppImage"
|
|
|
|
[[ -f "$unit_file" && -x "$apprun" ]] || return 0
|
|
grep -q "^ExecStart=${bare_appimage}\$" "$unit_file" || return 0
|
|
|
|
local port working_dir
|
|
port=$(awk -F'"' '/^Environment="PORT=/ {print $2; exit}' "$unit_file" 2>/dev/null \
|
|
| sed 's/^PORT=//')
|
|
[[ -z "$port" ]] && port="8008"
|
|
working_dir=$(awk -F'=' '/^WorkingDirectory=/ {print $2; exit}' "$unit_file" 2>/dev/null)
|
|
[[ -z "$working_dir" ]] && working_dir="/usr/local/share/proxmenux"
|
|
|
|
cat > "$unit_file" <<EOF
|
|
[Unit]
|
|
Description=ProxMenux Monitor - Web Dashboard
|
|
After=network.target
|
|
|
|
[Service]
|
|
Type=simple
|
|
User=root
|
|
WorkingDirectory=$working_dir
|
|
ExecStart=$apprun
|
|
Restart=on-failure
|
|
RestartSec=10
|
|
Environment="PORT=$port"
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|
|
EOF
|
|
|
|
systemctl daemon-reload >/dev/null 2>&1
|
|
systemctl restart proxmenux-monitor.service >/dev/null 2>&1
|
|
sleep 2
|
|
|
|
if systemctl is-active --quiet proxmenux-monitor.service 2>/dev/null; then
|
|
type msg_ok >/dev/null 2>&1 \
|
|
&& msg_ok "$(translate 'ProxMenux Monitor unit repaired and restarted')" \
|
|
|| echo "[ProxMenux] Monitor unit repaired and restarted"
|
|
fi
|
|
}
|
|
|
|
# ── Check for updates ──────────────────────────────────────
|
|
check_updates() {
|
|
if is_beta; then
|
|
check_updates_beta
|
|
else
|
|
check_updates_stable
|
|
fi
|
|
}
|
|
|
|
# ── Stable update check (main branch) ─────────────────────
|
|
check_updates_stable() {
|
|
local VERSION_URL="$REPO_MAIN/version.txt"
|
|
local INSTALL_URL="$REPO_MAIN/install_proxmenux.sh"
|
|
local INSTALL_SCRIPT="$BASE_DIR/install_proxmenux.sh"
|
|
|
|
[[ ! -f "$LOCAL_VERSION_FILE" ]] && return 0
|
|
|
|
local REMOTE_VERSION LOCAL_VERSION
|
|
REMOTE_VERSION="$(curl -fsSL "$VERSION_URL" 2>/dev/null | head -n 1)"
|
|
[[ -z "$REMOTE_VERSION" ]] && return 0
|
|
|
|
LOCAL_VERSION="$(head -n 1 "$LOCAL_VERSION_FILE" 2>/dev/null)"
|
|
[[ -z "$LOCAL_VERSION" ]] && return 0
|
|
[[ "$LOCAL_VERSION" = "$REMOTE_VERSION" ]] && return 0
|
|
|
|
if whiptail --title "$(translate 'Update Available')" \
|
|
--yesno "$(translate 'New version available') ($REMOTE_VERSION)\n\n$(translate 'Do you want to update now?')" \
|
|
10 60 --defaultno; then
|
|
|
|
msg_warn "$(translate 'Starting ProxMenux update...')"
|
|
|
|
if curl -fsSL "$INSTALL_URL" -o "$INSTALL_SCRIPT"; then
|
|
chmod +x "$INSTALL_SCRIPT"
|
|
# Replace this shell before the installer refreshes /usr/local/bin/menu.
|
|
exec bash "$INSTALL_SCRIPT" --update
|
|
fi
|
|
fi
|
|
}
|
|
|
|
# ── Beta-mode update check (main + develop) ───────────────
|
|
# 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 — reuse the non-beta path.
|
|
check_updates_stable
|
|
|
|
# 2. Beta build on develop.
|
|
[[ ! -f "$BETA_VERSION_FILE" ]] && return 0
|
|
|
|
local REMOTE_BETA LOCAL_BETA
|
|
REMOTE_BETA="$(curl -fsSL "$REPO_DEVELOP/beta_version.txt" 2>/dev/null | head -n 1)"
|
|
LOCAL_BETA="$(head -n 1 "$BETA_VERSION_FILE" 2>/dev/null)"
|
|
[[ -z "$REMOTE_BETA" || -z "$LOCAL_BETA" || "$LOCAL_BETA" = "$REMOTE_BETA" ]] && return 0
|
|
[[ "$(printf '%s\n%s\n' "$LOCAL_BETA" "$REMOTE_BETA" | sort -V | tail -1)" = "$REMOTE_BETA" ]] || return 0
|
|
|
|
if whiptail --title "Beta Update Available" \
|
|
--yesno "A new beta build is available!\n\nInstalled beta : $LOCAL_BETA\nNew beta build : $REMOTE_BETA\n\nDo you want to update now?" \
|
|
12 64 --defaultno; then
|
|
|
|
msg_warn "Updating to beta build $REMOTE_BETA ..."
|
|
|
|
local INSTALL_BETA_SCRIPT="$BASE_DIR/install_proxmenux_beta.sh"
|
|
if curl -fsSL "$REPO_DEVELOP/install_proxmenux_beta.sh" -o "$INSTALL_BETA_SCRIPT"; then
|
|
chmod +x "$INSTALL_BETA_SCRIPT"
|
|
# Replace this shell before the installer refreshes /usr/local/bin/menu.
|
|
exec bash "$INSTALL_BETA_SCRIPT" --update
|
|
else
|
|
msg_error "Could not download the beta installer from the develop branch."
|
|
fi
|
|
fi
|
|
}
|
|
|
|
# ── Main ───────────────────────────────────────────────────
|
|
main_menu() {
|
|
local MAIN_MENU="$LOCAL_SCRIPTS/menus/main_menu.sh"
|
|
exec bash "$MAIN_MENU"
|
|
}
|
|
|
|
load_language
|
|
initialize_cache
|
|
auto_repair_monitor_unit
|
|
check_updates
|
|
main_menu
|