diff --git a/beta_version.txt b/beta_version.txt new file mode 100644 index 00000000..42ffbff8 --- /dev/null +++ b/beta_version.txt @@ -0,0 +1 @@ +1.1.9.1 \ No newline at end of file diff --git a/install_proxmenux_beta.sh b/install_proxmenux_beta.sh new file mode 100755 index 00000000..50bda83e --- /dev/null +++ b/install_proxmenux_beta.sh @@ -0,0 +1,583 @@ +#!/bin/bash + +# ========================================================== +# ProxMenux Monitor - Beta Program Installer +# ========================================================== +# Author : MacRimi +# Subproject : ProxMenux Monitor Beta +# Copyright : (c) 2024-2025 MacRimi +# License : GPL-3.0 (https://github.com/MacRimi/ProxMenux/blob/main/LICENSE) +# Version : Beta +# Branch : develop +# ========================================================== +# Description: +# This script installs the BETA version of ProxMenux Monitor +# from the develop branch on GitHub. +# +# Beta testers are expected to: +# - Report bugs and unexpected behavior via GitHub Issues +# - Provide feedback to help improve the final release +# +# Installs: +# • dialog, curl, jq, git (system dependencies) +# • ProxMenux core files (/usr/local/share/proxmenux) +# • ProxMenux Monitor AppImage (Web dashboard on port 8008) +# • Systemd service (auto-start on boot) +# +# Notes: +# - Clones from the 'develop' branch +# - Beta version file: beta_version.txt in the repository +# - Transition to stable: re-run the official installer +# ========================================================== + +# ── Configuration ────────────────────────────────────────── +INSTALL_DIR="/usr/local/bin" +BASE_DIR="/usr/local/share/proxmenux" +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" +MENU_SCRIPT="menu" + +MONITOR_INSTALL_DIR="$BASE_DIR" +MONITOR_SERVICE_FILE="/etc/systemd/system/proxmenux-monitor.service" +MONITOR_PORT=8008 + +REPO_URL="https://github.com/MacRimi/ProxMenux.git" +REPO_BRANCH="develop" +TEMP_DIR="/tmp/proxmenux-beta-install-$$" + +# ── Colors ───────────────────────────────────────────────── +RESET="\033[0m" +BOLD="\033[1m" +WHITE="\033[38;5;15m" +NEON_PURPLE_BLUE="\033[38;5;99m" +DARK_GRAY="\033[38;5;244m" +ORANGE="\033[38;5;208m" +GN="\033[1;92m" +YW="\033[33m" +YWB="\033[1;33m" +RD="\033[01;31m" +BL="\033[36m" +CL="\033[m" +BGN="\e[1;32m" +TAB=" " +BFR="\\r\\033[K" +HOLD="-" +BOR=" | " +CM="${GN}✓ ${CL}" + +SPINNER_PID="" + +# ── Spinner ──────────────────────────────────────────────── +spinner() { + local frames=('⠋' '⠙' '⠹' '⠸' '⠼' '⠴' '⠦' '⠧' '⠇' '⠏') + local spin_i=0 + printf "\e[?25l" + while true; do + printf "\r ${YW}%s${CL}" "${frames[spin_i]}" + spin_i=$(( (spin_i + 1) % ${#frames[@]} )) + sleep 0.1 + done +} + +type_text() { + local text="$1" + local delay=0.04 + for ((i=0; i<${#text}; i++)); do + echo -n "${text:$i:1}" + sleep $delay + done + echo +} + +msg_info() { + local msg="$1" + echo -ne "${TAB}${YW}${HOLD}${msg}" + spinner & + SPINNER_PID=$! +} + +msg_ok() { + if [ -n "$SPINNER_PID" ] && ps -p $SPINNER_PID > /dev/null 2>&1; then + kill $SPINNER_PID > /dev/null 2>&1 + SPINNER_PID="" + fi + printf "\e[?25h" + echo -e "${BFR}${TAB}${CM}${GN}${1}${CL}" +} + +msg_error() { + if [ -n "$SPINNER_PID" ] && ps -p $SPINNER_PID > /dev/null 2>&1; then + kill $SPINNER_PID > /dev/null 2>&1 + SPINNER_PID="" + fi + printf "\e[?25h" + echo -e "${BFR}${TAB}${RD}[ERROR] ${1}${CL}" +} + +msg_warn() { + if [ -n "$SPINNER_PID" ] && ps -p $SPINNER_PID > /dev/null 2>&1; then + kill $SPINNER_PID > /dev/null 2>&1 + SPINNER_PID="" + fi + printf "\e[?25h" + echo -e "${BFR}${TAB}${YWB}${1}${CL}" +} + +msg_title() { + echo -e "\n" + echo -e "${TAB}${BOLD}${HOLD}${BOR}${1}${BOR}${HOLD}${CL}" + echo -e "\n" +} + +show_progress() { + echo -e "\n${BOLD}${BL}${TAB}Installing ProxMenux Beta: Step ${1} of ${2}${CL}" + echo + echo -e "${TAB}${BOLD}${YW}${HOLD}${3}${CL}" +} + +# ── Cleanup ──────────────────────────────────────────────── +cleanup() { + if [ -d "$TEMP_DIR" ]; then + rm -rf "$TEMP_DIR" + fi +} +trap cleanup EXIT + +# ── Logo ─────────────────────────────────────────────────── +show_proxmenux_logo() { + clear + + if [[ -z "$SSH_TTY" && -z "$(who am i | awk '{print $NF}' | grep -E '([0-9]{1,3}\.){3}[0-9]{1,3}')" ]]; then + +LOGO=$(cat << "EOF" +\e[0m\e[38;2;61;61;61m▆\e[38;2;60;60;60m▄\e[38;2;54;54;54m▂\e[0m \e[38;2;0;0;0m \e[0m \e[38;2;54;54;54m▂\e[38;2;60;60;60m▄\e[38;2;61;61;61m▆\e[0m +\e[38;2;59;59;59;48;2;62;62;62m▏ \e[38;2;61;61;61;48;2;37;37;37m▇\e[0m\e[38;2;60;60;60m▅\e[38;2;56;56;56m▃\e[38;2;37;37;37m▁ \e[38;2;36;36;36m▁\e[38;2;56;56;56m▃\e[38;2;60;60;60m▅\e[38;2;61;61;61;48;2;37;37;37m▇\e[48;2;62;62;62m \e[0m\e[7m\e[38;2;60;60;60m▁\e[0m +\e[38;2;59;59;59;48;2;62;62;62m▏ \e[0m\e[7m\e[38;2;61;61;61m▂\e[0m\e[38;2;62;62;62;48;2;61;61;61m┈\e[48;2;62;62;62m \e[48;2;61;61;61m┈\e[0m\e[38;2;60;60;60m▆\e[38;2;57;57;57m▄\e[38;2;48;48;48m▂\e[0m \e[38;2;47;47;47m▂\e[38;2;57;57;57m▄\e[38;2;60;60;60m▆\e[38;2;62;62;62;48;2;61;61;61m┈\e[48;2;62;62;62m \e[48;2;61;61;61m┈\e[0m\e[7m\e[38;2;60;60;60m▂\e[38;2;57;57;57m▄\e[38;2;47;47;47m▆\e[0m \e[0m +\e[38;2;59;59;59;48;2;62;62;62m▏ \e[0m\e[38;2;32;32;32m▏\e[7m\e[38;2;39;39;39m▇\e[38;2;57;57;57m▅\e[38;2;60;60;60m▃\e[0m\e[38;2;40;40;40;48;2;61;61;61m▁\e[48;2;62;62;62m \e[38;2;54;54;54;48;2;61;61;61m┊\e[48;2;62;62;62m \e[38;2;39;39;39;48;2;61;61;61m▁\e[0m\e[7m\e[38;2;60;60;60m▃\e[38;2;57;57;57m▅\e[38;2;38;38;38m▇\e[0m \e[38;2;193;60;2m▃\e[38;2;217;67;2m▅\e[38;2;225;70;2m▇\e[0m +\e[38;2;59;59;59;48;2;62;62;62m▏ \e[0m\e[38;2;32;32;32m▏\e[0m \e[38;2;203;63;2m▄\e[38;2;147;45;1m▂\e[0m \e[7m\e[38;2;55;55;55m▆\e[38;2;60;60;60m▄\e[38;2;61;61;61m▂\e[38;2;60;60;60m▄\e[38;2;55;55;55m▆\e[0m \e[38;2;144;44;1m▂\e[38;2;202;62;2m▄\e[38;2;219;68;2m▆\e[38;2;231;72;3;48;2;226;70;2m┈\e[48;2;231;72;3m \e[48;2;225;70;2m▉\e[0m +\e[38;2;59;59;59;48;2;62;62;62m▏ \e[0m\e[38;2;32;32;32m▏\e[7m\e[38;2;121;37;1m▉\e[0m\e[38;2;0;0;0;48;2;231;72;3m \e[0m\e[38;2;221;68;2m▇\e[38;2;208;64;2m▅\e[38;2;212;66;2m▂\e[38;2;123;37;0m▁\e[38;2;211;65;2m▂\e[38;2;207;64;2m▅\e[38;2;220;68;2m▇\e[48;2;231;72;3m \e[38;2;231;72;3;48;2;225;70;2m┈\e[0m\e[7m\e[38;2;221;68;2m▂\e[0m\e[38;2;44;13;0;48;2;231;72;3m \e[38;2;231;72;3;48;2;225;70;2m▉\e[0m +\e[38;2;59;59;59;48;2;62;62;62m▏ \e[0m\e[38;2;32;32;32m▏\e[0m \e[7m\e[38;2;190;59;2m▅\e[38;2;216;67;2m▃\e[38;2;225;70;2m▁\e[0m\e[38;2;95;29;0;48;2;231;72;3m \e[38;2;231;72;3;48;2;230;71;2m┈\e[48;2;231;72;3m \e[0m\e[7m\e[38;2;225;70;2m▁\e[38;2;216;67;2m▃\e[38;2;191;59;2m▅\e[0m \e[38;2;0;0;0;48;2;231;72;3m \e[38;2;231;72;3;48;2;225;70;2m▉\e[0m +\e[38;2;59;59;59;48;2;62;62;62m▏ \e[0m\e[38;2;32;32;32m▏ \e[0m \e[7m\e[38;2;172;53;1m▆\e[38;2;213;66;2m▄\e[38;2;219;68;2m▂\e[38;2;213;66;2m▄\e[38;2;174;54;2m▆\e[0m \e[38;2;0;0;0m \e[0m \e[38;2;0;0;0;48;2;231;72;3m \e[38;2;231;72;3;48;2;225;70;2m▉\e[0m +\e[38;2;59;59;59;48;2;62;62;62m▏ \e[0m\e[38;2;32;32;32m▏ \e[0m \e[38;2;0;0;0;48;2;231;72;3m \e[38;2;231;72;3;48;2;225;70;2m▉\e[0m +\e[7m\e[38;2;52;52;52m▆\e[38;2;59;59;59m▄\e[38;2;61;61;61m▂\e[0m\e[38;2;31;31;31m▏ \e[0m \e[7m\e[38;2;228;71;2m▂\e[38;2;221;69;2m▄\e[38;2;196;60;2m▆\e[0m +EOF +) + TEXT=( + "" + "" + "${BOLD}ProxMenux${RESET}" + "" + "${BOLD}${NEON_PURPLE_BLUE}An Interactive Menu for${RESET}" + "${BOLD}${NEON_PURPLE_BLUE}Proxmox VE management${RESET}" + "" + "${BOLD}${YW} ★ BETA PROGRAM ★${RESET}" + "" + "" + ) + mapfile -t logo_lines <<< "$LOGO" + for i in {0..9}; do + echo -e "${TAB}${logo_lines[i]} ${WHITE}│${RESET} ${TEXT[i]}" + done + echo -e + + else + + TEXT=( + "" "" "" "" + "${BOLD}ProxMenux${RESET}" + "" + "${BOLD}${NEON_PURPLE_BLUE}An Interactive Menu for${RESET}" + "${BOLD}${NEON_PURPLE_BLUE}Proxmox VE management${RESET}" + "" + "${BOLD}${YW} ★ BETA PROGRAM ★${RESET}" + "" "" "" + ) + LOGO=( + "${DARK_GRAY}░░░░ ░░░░${RESET}" + "${DARK_GRAY}░░░░░░░ ░░░░░░ ${RESET}" + "${DARK_GRAY}░░░░░░░░░░░ ░░░░░░░ ${RESET}" + "${DARK_GRAY}░░░░ ░░░░░░ ░░░░░░ ${ORANGE}░░${RESET}" + "${DARK_GRAY}░░░░ ░░░░░░░ ${ORANGE}░░▒▒▒${RESET}" + "${DARK_GRAY}░░░░ ░░░ ${ORANGE}░▒▒▒▒▒▒▒${RESET}" + "${DARK_GRAY}░░░░ ${ORANGE}▒▒▒░ ░▒▒▒▒▒▒▒▒▒▒${RESET}" + "${DARK_GRAY}░░░░ ${ORANGE}░▒▒▒▒▒ ▒▒▒▒▒░░ ▒▒▒▒${RESET}" + "${DARK_GRAY}░░░░ ${ORANGE}░░▒▒▒▒▒▒▒░░ ▒▒▒▒${RESET}" + "${DARK_GRAY}░░░░ ${ORANGE}░░░ ▒▒▒▒${RESET}" + "${DARK_GRAY}░░░░ ${ORANGE}▒▒▒▒${RESET}" + "${DARK_GRAY}░░░░ ${ORANGE}▒▒▒░${RESET}" + "${DARK_GRAY} ░░ ${ORANGE}░░ ${RESET}" + ) + for i in {0..12}; do + echo -e "${TAB}${LOGO[i]} │${RESET} ${TEXT[i]}" + done + echo -e + fi +} + +# ── Beta welcome message ─────────────────────────────────── +show_beta_welcome() { + local width=62 + local line + line=$(printf '─%.0s' $(seq 1 $width)) + + echo -e "${TAB}${BOLD}${YW}┌${line}┐${CL}" + echo -e "${TAB}${BOLD}${YW}│${CL}${BOLD} Welcome to the ProxMenux Monitor Beta Program ${YW}│${CL}" + echo -e "${TAB}${BOLD}${YW}└${line}┘${CL}" + echo + echo -e "${TAB}${WHITE}You are about to install a ${BOLD}pre-release (beta)${RESET}${WHITE} version of${CL}" + echo -e "${TAB}${WHITE}ProxMenux Monitor, built from the ${BOLD}develop${RESET}${WHITE} branch.${CL}" + echo + echo -e "${TAB}${BOLD}${GN}What this means for you:${CL}" + echo -e "${TAB} ${GN}•${CL} You'll get the latest features before the official release." + echo -e "${TAB} ${GN}•${CL} Some things may not work perfectly — that's expected." + echo -e "${TAB} ${GN}•${CL} Your feedback is what makes the final version better." + echo + echo -e "${TAB}${BOLD}${YW}How to report issues:${CL}" + echo -e "${TAB} ${YW}→${CL} Open a GitHub Issue at:" + echo -e "${TAB} ${BL}https://github.com/MacRimi/ProxMenux/issues${CL}" + echo -e "${TAB} ${YW}→${CL} Describe what happened, what you expected, and any" + echo -e "${TAB} error messages you saw. Logs help a lot:" + echo -e "${TAB} ${DARK_GRAY}journalctl -u proxmenux-monitor -n 50${CL}" + echo + echo -e "${TAB}${BOLD}${NEON_PURPLE_BLUE}Thank you for being part of the beta program!${CL}" + echo -e "${TAB}${DARK_GRAY}Your help is essential to deliver a stable and polished release.${CL}" + echo + echo -e "${TAB}${BOLD}${YW}┌${line}┐${CL}" + echo -e "${TAB}${BOLD}${YW}│${CL} ${YW}│${CL}" + echo -e "${TAB}${BOLD}${YW}│${CL} Press ${BOLD}${GN}[Enter]${CL} to continue with the beta installation, ${YW}│${CL}" + echo -e "${TAB}${BOLD}${YW}│${CL} or ${BOLD}${RD}[Ctrl+C]${CL} to cancel and exit. ${YW}│${CL}" + echo -e "${TAB}${BOLD}${YW}│${CL} ${YW}│${CL}" + echo -e "${TAB}${BOLD}${YW}└${line}┘${CL}" + echo + + read -r -p "" + echo +} + +# ── Helpers ──────────────────────────────────────────────── +get_server_ip() { + local ip + ip=$(ip route get 1.1.1.1 2>/dev/null | grep -oP 'src \K\S+') + [ -z "$ip" ] && ip=$(hostname -I | awk '{print $1}') + [ -z "$ip" ] && ip="localhost" + echo "$ip" +} + +update_config() { + local component="$1" + local status="$2" + local timestamp + timestamp=$(date -u +"%Y-%m-%dT%H:%M:%SZ") + + mkdir -p "$(dirname "$CONFIG_FILE")" + [ ! -f "$CONFIG_FILE" ] || ! jq empty "$CONFIG_FILE" >/dev/null 2>&1 && echo '{}' > "$CONFIG_FILE" + + local tmp_file + tmp_file=$(mktemp) + if jq --arg comp "$component" --arg stat "$status" --arg time "$timestamp" \ + '.[$comp] = {status: $stat, timestamp: $time}' "$CONFIG_FILE" > "$tmp_file" 2>/dev/null; then + mv "$tmp_file" "$CONFIG_FILE" + else + echo '{}' > "$CONFIG_FILE" + fi + [ -f "$tmp_file" ] && rm -f "$tmp_file" +} + +cleanup_corrupted_files() { + if [ -f "$CONFIG_FILE" ] && ! jq empty "$CONFIG_FILE" >/dev/null 2>&1; then + rm -f "$CONFIG_FILE" + fi + if [ -f "$CACHE_FILE" ] && ! jq empty "$CACHE_FILE" >/dev/null 2>&1; then + rm -f "$CACHE_FILE" + fi +} + +detect_latest_appimage() { + local appimage_dir="$TEMP_DIR/AppImage" + [ ! -d "$appimage_dir" ] && return 1 + local latest + latest=$(find "$appimage_dir" -name "ProxMenux-*.AppImage" -type f | sort -V | tail -1) + [ -z "$latest" ] && return 1 + echo "$latest" +} + +get_appimage_version() { + local filename + filename=$(basename "$1") + echo "$filename" | grep -oP 'ProxMenux-\K[0-9]+\.[0-9]+\.[0-9]+' +} + +# ── Monitor install ──────────────────────────────────────── +install_proxmenux_monitor() { + local appimage_source + appimage_source=$(detect_latest_appimage) + + if [ -z "$appimage_source" ] || [ ! -f "$appimage_source" ]; then + msg_error "ProxMenux Monitor AppImage not found in $TEMP_DIR/AppImage/" + msg_warn "Make sure the AppImage directory exists in the develop branch." + update_config "proxmenux_monitor" "appimage_not_found" + return 1 + fi + + local appimage_version + appimage_version=$(get_appimage_version "$appimage_source") + + systemctl is-active --quiet proxmenux-monitor.service 2>/dev/null && \ + systemctl stop proxmenux-monitor.service + + local service_exists=false + [ -f "$MONITOR_SERVICE_FILE" ] && service_exists=true + + local sha256_file="$TEMP_DIR/AppImage/ProxMenux-Monitor.AppImage.sha256" + if [ -f "$sha256_file" ]; then + msg_info "Verifying AppImage integrity..." + local expected_hash actual_hash + expected_hash=$(grep -Eo '^[a-f0-9]+' "$sha256_file" | tr -d '\n') + actual_hash=$(sha256sum "$appimage_source" | awk '{print $1}') + if [ "$expected_hash" != "$actual_hash" ]; then + msg_error "SHA256 verification failed! The AppImage may be corrupted." + return 1 + fi + msg_ok "SHA256 verification passed." + else + msg_warn "SHA256 checksum file not found. Skipping verification." + fi + + msg_info "Installing ProxMenux Monitor (beta)..." + mkdir -p "$MONITOR_INSTALL_DIR" + local target_path="$MONITOR_INSTALL_DIR/ProxMenux-Monitor.AppImage" + cp "$appimage_source" "$target_path" + chmod +x "$target_path" + msg_ok "ProxMenux Monitor beta v${appimage_version} installed." + + if [ "$service_exists" = false ]; then + return 0 + else + systemctl start proxmenux-monitor.service + sleep 2 + if systemctl is-active --quiet proxmenux-monitor.service; then + update_config "proxmenux_monitor" "beta_updated" + return 2 + else + msg_warn "Service failed to restart. Check: journalctl -u proxmenux-monitor" + update_config "proxmenux_monitor" "failed" + return 1 + fi + fi +} + +create_monitor_service() { + msg_info "Creating ProxMenux Monitor service..." + local exec_path="$MONITOR_INSTALL_DIR/ProxMenux-Monitor.AppImage" + + if [ -f "$TEMP_DIR/systemd/proxmenux-monitor.service" ]; then + sed "s|ExecStart=.*|ExecStart=$exec_path|g" \ + "$TEMP_DIR/systemd/proxmenux-monitor.service" > "$MONITOR_SERVICE_FILE" + msg_ok "Service file loaded from repository." + else + cat > "$MONITOR_SERVICE_FILE" << EOF +[Unit] +Description=ProxMenux Monitor - Web Dashboard (Beta) +After=network.target + +[Service] +Type=simple +User=root +WorkingDirectory=$MONITOR_INSTALL_DIR +ExecStart=$exec_path +Restart=on-failure +RestartSec=10 +Environment="PORT=$MONITOR_PORT" + +[Install] +WantedBy=multi-user.target +EOF + msg_ok "Default service file created." + fi + + systemctl daemon-reload + systemctl enable proxmenux-monitor.service > /dev/null 2>&1 + systemctl start proxmenux-monitor.service > /dev/null 2>&1 + sleep 3 + + if systemctl is-active --quiet proxmenux-monitor.service; then + msg_ok "ProxMenux Monitor service started successfully." + update_config "proxmenux_monitor" "beta_installed" + return 0 + else + msg_warn "ProxMenux Monitor service failed to start." + echo -e "${TAB}${DARK_GRAY}Check logs : journalctl -u proxmenux-monitor -n 20${CL}" + echo -e "${TAB}${DARK_GRAY}Check status: systemctl status proxmenux-monitor${CL}" + update_config "proxmenux_monitor" "failed" + return 1 + fi +} + +# ── Main install ─────────────────────────────────────────── +install_beta() { + local total_steps=4 + local current_step=1 + + # ── Step 1: Dependencies ────────────────────────────── + show_progress $current_step $total_steps "Installing system dependencies" + + if ! command -v jq > /dev/null 2>&1; then + apt-get update > /dev/null 2>&1 + if apt-get install -y jq > /dev/null 2>&1 && command -v jq > /dev/null 2>&1; then + update_config "jq" "installed" + else + local jq_url="https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64" + if wget -q -O /usr/local/bin/jq "$jq_url" 2>/dev/null && chmod +x /usr/local/bin/jq \ + && command -v jq > /dev/null 2>&1; then + update_config "jq" "installed_from_github" + else + msg_error "Failed to install jq. Please install it manually and re-run." + update_config "jq" "failed" + return 1 + fi + fi + else + update_config "jq" "already_installed" + fi + + local BASIC_DEPS=("dialog" "curl" "git") + if [ -z "${APT_UPDATED:-}" ]; then + apt-get update -y > /dev/null 2>&1 || true + APT_UPDATED=1 + fi + + for pkg in "${BASIC_DEPS[@]}"; do + if ! dpkg -l | grep -qw "$pkg"; then + if apt-get install -y "$pkg" > /dev/null 2>&1; then + update_config "$pkg" "installed" + else + msg_error "Failed to install $pkg. Please install it manually." + update_config "$pkg" "failed" + return 1 + fi + else + update_config "$pkg" "already_installed" + fi + done + + msg_ok "Dependencies installed: jq, dialog, curl, git." + + # ── Step 2: Clone develop branch ───────────────────── + ((current_step++)) + show_progress $current_step $total_steps "Cloning ProxMenux develop branch" + + msg_info "Cloning branch '${REPO_BRANCH}' from repository..." + if ! git clone --depth 1 --branch "$REPO_BRANCH" "$REPO_URL" "$TEMP_DIR" 2>/dev/null; then + msg_error "Failed to clone branch '$REPO_BRANCH' from $REPO_URL" + exit 1 + fi + msg_ok "Repository cloned successfully (branch: ${REPO_BRANCH})." + + # Read beta version if available + local beta_version="unknown" + if [ -f "$TEMP_DIR/beta_version.txt" ]; then + beta_version=$(cat "$TEMP_DIR/beta_version.txt" | tr -d '[:space:]') + fi + + cd "$TEMP_DIR" + + # ── Step 3: Files ───────────────────────────────────── + ((current_step++)) + show_progress $current_step $total_steps "Creating directories and copying files" + + mkdir -p "$BASE_DIR" "$INSTALL_DIR" + [ ! -f "$CONFIG_FILE" ] && echo '{}' > "$CONFIG_FILE" + + cp "./scripts/utils.sh" "$UTILS_FILE" + cp "./menu" "$INSTALL_DIR/$MENU_SCRIPT" + cp "./version.txt" "$LOCAL_VERSION_FILE" 2>/dev/null || true + + # Store beta version marker + if [ -f "$TEMP_DIR/beta_version.txt" ]; then + cp "$TEMP_DIR/beta_version.txt" "$BETA_VERSION_FILE" + else + echo "$beta_version" > "$BETA_VERSION_FILE" + fi + + cp "./install_proxmenux.sh" "$BASE_DIR/install_proxmenux.sh" 2>/dev/null || true + cp "./install_proxmenux_beta.sh" "$BASE_DIR/install_proxmenux_beta.sh" 2>/dev/null || true + + mkdir -p "$BASE_DIR/scripts" + cp -r "./scripts/"* "$BASE_DIR/scripts/" + chmod -R +x "$BASE_DIR/scripts/" + chmod +x "$INSTALL_DIR/$MENU_SCRIPT" + [ -f "$BASE_DIR/install_proxmenux.sh" ] && chmod +x "$BASE_DIR/install_proxmenux.sh" + [ -f "$BASE_DIR/install_proxmenux_beta.sh" ] && chmod +x "$BASE_DIR/install_proxmenux_beta.sh" + + # Store beta flag in config + update_config "beta_program" "active" + update_config "beta_version" "$beta_version" + update_config "install_branch" "$REPO_BRANCH" + + msg_ok "Files installed. Beta version: ${beta_version}." + + # ── Step 4: Monitor ─────────────────────────────────── + ((current_step++)) + show_progress $current_step $total_steps "Installing ProxMenux Monitor (beta)" + + install_proxmenux_monitor + local monitor_status=$? + + if [ $monitor_status -eq 0 ]; then + create_monitor_service + elif [ $monitor_status -eq 2 ]; then + msg_ok "ProxMenux Monitor beta updated successfully." + fi + + msg_ok "Beta installation completed." +} + +# ── Stable transition notice ─────────────────────────────── +check_stable_available() { + # Called if a stable version is detected (future use by update logic) + # When main's version.txt > beta_version.txt, the menu/updater can call this + echo -e "\n${TAB}${BOLD}${GN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${CL}" + echo -e "${TAB}${BOLD}${GN} A stable release is now available!${CL}" + echo -e "${TAB}${WHITE} To leave the beta program and switch to the stable version,${CL}" + echo -e "${TAB}${WHITE} run the official installer:${CL}" + echo -e "" + echo -e "${TAB} ${YWB}bash -c \"\$(wget -qLO - https://raw.githubusercontent.com/MacRimi/ProxMenux/main/install_proxmenux.sh)\"${CL}" + echo -e "" + echo -e "${TAB}${DARK_GRAY} This will cleanly replace your beta install with the stable release.${CL}" + echo -e "${TAB}${BOLD}${GN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${CL}\n" +} + +# ── Entry point ──────────────────────────────────────────── +if [ "$(id -u)" -ne 0 ]; then + echo -e "${RD}[ERROR] This script must be run as root.${CL}" + exit 1 +fi + +cleanup_corrupted_files +show_proxmenux_logo +show_beta_welcome + +msg_title "Installing ProxMenux Beta — branch: develop" +install_beta + +# Load utils if available +[ -f "$UTILS_FILE" ] && source "$UTILS_FILE" + +msg_title "ProxMenux Beta installed successfully" + +if systemctl is-active --quiet proxmenux-monitor.service; then + local_ip=$(get_server_ip) + echo -e "${GN}🌐 ProxMenux Monitor (beta) is running${CL}: ${BL}http://${local_ip}:${MONITOR_PORT}${CL}" + echo +fi + +echo -ne "${GN}" +type_text "To run ProxMenux, execute this command in your terminal:" +echo -e "${YWB} menu${CL}" +echo +echo -e "${TAB}${DARK_GRAY}Report issues at: https://github.com/MacRimi/ProxMenux/issues${CL}" +echo +exit 0 \ No newline at end of file diff --git a/menu b/menu index c587f8ea..a384c231 100644 --- a/menu +++ b/menu @@ -4,102 +4,173 @@ # ProxMenux - A menu-driven script for Proxmox VE management # ========================================================== # Author : MacRimi -# Copyright : (c) 2024 MacRimi -# License : (GPL-3.0) (https://github.com/MacRimi/ProxMenux/blob/main/LICENSE) -# Version : 1.1 -# Last Updated: 04/07/2025 +# 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: -# This script serves as the main entry point for ProxMenux, -# a menu-driven tool designed for Proxmox VE management. -# - Displays the ProxMenux logo on startup. -# - Loads necessary configurations and language settings. -# - Checks for available updates and installs them if confirmed. -# - Downloads and executes the latest main menu script. -# -# Key Features: -# - Ensures ProxMenux is always up-to-date by fetching the latest version. -# - Uses whiptail for interactive menus and language selection. -# - Loads utility functions and translation support. -# - Maintains a cache system to improve performance. -# - Executes the ProxMenux main menu dynamically from the repository. -# -# This script ensures a streamlined and automated experience -# for managing Proxmox VE using ProxMenux. +# 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 ============================================ -REPO_URL="https://raw.githubusercontent.com/MacRimi/ProxMenux/main" +# ── 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" -if [[ -f "$UTILS_FILE" ]]; then +REPO_MAIN="https://raw.githubusercontent.com/MacRimi/ProxMenux/main" +REPO_DEVELOP="https://raw.githubusercontent.com/MacRimi/ProxMenux/develop" - source "$UTILS_FILE" -fi +# ── 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" ]] +} +# ── Check for updates ────────────────────────────────────── check_updates() { - local VERSION_URL INSTALL_URL INSTALL_SCRIPT - local REMOTE_VERSION LOCAL_VERSION - - VERSION_URL="$REPO_URL/version.txt" - INSTALL_URL="$REPO_URL/install_proxmenux.sh" - INSTALL_SCRIPT="$BASE_DIR/install_proxmenux.sh" + 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" - - bash "$INSTALL_SCRIPT" --update - - return 0 - fi - fi } +# ── Beta update check (develop branch) ──────────────────── +check_updates_beta() { + local BETA_VERSION_URL="$REPO_DEVELOP/beta_version.txt" + local STABLE_VERSION_URL="$REPO_MAIN/version.txt" + local INSTALL_BETA_URL="$REPO_DEVELOP/install_proxmenux_beta.sh" + local INSTALL_STABLE_URL="$REPO_MAIN/install_proxmenux.sh" + local INSTALL_SCRIPT="$BASE_DIR/install_proxmenux_beta.sh" + # ── 1. Check if a stable release has superseded the beta ── + # If main's version.txt exists and is newer than local beta_version.txt, + # the beta cycle is over and we invite the user to switch to stable. + local STABLE_VERSION BETA_LOCAL_VERSION + STABLE_VERSION="$(curl -fsSL "$STABLE_VERSION_URL" 2>/dev/null | head -n 1)" + BETA_LOCAL_VERSION="$(head -n 1 "$BETA_VERSION_FILE" 2>/dev/null)" + if [[ -n "$STABLE_VERSION" && -n "$BETA_LOCAL_VERSION" ]]; then + # Simple string comparison is enough if versions follow semver x.y.z + if [[ "$STABLE_VERSION" != "$BETA_LOCAL_VERSION" ]] && \ + printf '%s\n' "$BETA_LOCAL_VERSION" "$STABLE_VERSION" | sort -V | tail -1 | grep -qx "$STABLE_VERSION"; then + # Stable is newer — offer migration out of beta + if whiptail --title "🎉 Stable Release Available" \ + --yesno "A stable release of ProxMenux is now available!\n\nStable version : $STABLE_VERSION\nYour beta : $BETA_LOCAL_VERSION\n\nThe beta program for this cycle is complete.\nWould you like to switch to the stable release now?\n\n(Choosing 'No' keeps you on the beta for now.)" \ + 16 68; then + msg_warn "Switching to stable release $STABLE_VERSION ..." + + local tmp_installer="/tmp/install_proxmenux_stable_$$.sh" + if curl -fsSL "$INSTALL_STABLE_URL" -o "$tmp_installer"; then + chmod +x "$tmp_installer" + bash "$tmp_installer" + rm -f "$tmp_installer" + else + msg_error "Could not download the stable installer. Try manually:" + echo + echo " bash -c \"\$(wget -qLO - $INSTALL_STABLE_URL)\"" + echo + fi + return 0 + fi + # User chose to stay on beta — continue normally + return 0 + fi + fi + + # ── 2. Check for a newer beta build on develop ───────────── + [[ ! -f "$BETA_VERSION_FILE" ]] && return 0 + + local REMOTE_BETA_VERSION + REMOTE_BETA_VERSION="$(curl -fsSL "$BETA_VERSION_URL" 2>/dev/null | head -n 1)" + [[ -z "$REMOTE_BETA_VERSION" ]] && return 0 + [[ "$BETA_LOCAL_VERSION" = "$REMOTE_BETA_VERSION" ]] && return 0 + + if whiptail --title "Beta Update Available" \ + --yesno "A new beta build is available!\n\nInstalled beta : $BETA_LOCAL_VERSION\nNew beta build : $REMOTE_BETA_VERSION\n\nThis is a pre-release build from the develop branch.\nDo you want to update now?" \ + 13 64 --defaultno; then + + msg_warn "Updating to beta build $REMOTE_BETA_VERSION ..." + + if curl -fsSL "$INSTALL_BETA_URL" -o "$INSTALL_SCRIPT"; then + chmod +x "$INSTALL_SCRIPT" + bash "$INSTALL_SCRIPT" --update + else + msg_error "Could not download the beta installer from the develop branch." + fi + fi +} + +# ── Beta status banner ───────────────────────────────────── +# Shows a subtle reminder in the terminal that this is a beta install. +show_beta_banner() { + is_beta || return 0 + local beta_ver + beta_ver=$(head -n 1 "$BETA_VERSION_FILE" 2>/dev/null || echo "unknown") + echo -e "\033[33m ★ Beta Program — build ${beta_ver} (develop branch)\033[m" + echo -e "\033[38;5;244m Report issues → https://github.com/MacRimi/ProxMenux/issues\033[m" + echo +} + +# ── Main ─────────────────────────────────────────────────── main_menu() { local MAIN_MENU="$LOCAL_SCRIPTS/menus/main_menu.sh" - exec bash "$MAIN_MENU" } load_language initialize_cache +show_beta_banner check_updates main_menu diff --git a/scripts/menus/main_menu_.sh b/scripts/menus/main_menu_.sh deleted file mode 100644 index 2cc9f685..00000000 --- a/scripts/menus/main_menu_.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -# ========================================================== -# ProxMenux - A menu-driven script for Proxmox VE management -# ========================================================== -# Author : MacRimi -# Copyright : (c) 2024 MacRimi -# License : (GPL-3.0) (https://github.com/MacRimi/ProxMenux/blob/main/LICENSE) -# Version : 2.0 -# Last Updated: 04/04/2025 -# ========================================================== - -# Configuration ============================================ -LOCAL_SCRIPTS="/usr/local/share/proxmenux/scripts" -BASE_DIR="/usr/local/share/proxmenux" -UTILS_FILE="$BASE_DIR/utils.sh" -VENV_PATH="/opt/googletrans-env" - -if [[ -f "$UTILS_FILE" ]]; then - source "$UTILS_FILE" -fi - -load_language -initialize_cache -# ========================================================== - -if ! command -v dialog &>/dev/null; then - apt update -qq >/dev/null 2>&1 - apt install -y dialog >/dev/null 2>&1 -fi - -show_menu() { - local TEMP_FILE - TEMP_FILE=$(mktemp) - - while true; do - dialog --clear \ - --backtitle "ProxMenux" \ - --title "$(translate "Main ProxMenux")" \ - --menu "$(translate "Select an option:")" 20 70 10 \ - 1 "$(translate "Settings post-install Proxmox")" \ - 2 "$(translate "Help and Info Commands")" \ - 3 "$(translate "Hardware: GPUs and Coral-TPU")" \ - 4 "$(translate "Create VM from template or script")" \ - 5 "$(translate "Disk and Storage Manager")" \ - 6 "$(translate "Proxmox VE Helper Scripts")" \ - 7 "$(translate "Network Management")" \ - 8 "$(translate "Utilities and Tools")" \ - 9 "$(translate "Settings")" \ - 0 "$(translate "Exit")" 2>"$TEMP_FILE" - - local EXIT_STATUS=$? - - if [[ $EXIT_STATUS -ne 0 ]]; then - # ESC pressed or Cancel - clear - msg_ok "$(translate "Thank you for using ProxMenux. Goodbye!")" - rm -f "$TEMP_FILE" - exit 0 - fi - - OPTION=$(<"$TEMP_FILE") - - case $OPTION in - 1) exec bash "$LOCAL_SCRIPTS/menus/menu_post_install.sh" ;; - 2) bash "$LOCAL_SCRIPTS/help_info_menu.sh" ;; - 3) exec bash "$LOCAL_SCRIPTS/menus/hw_grafics_menu.sh" ;; - 4) exec bash "$LOCAL_SCRIPTS/menus/create_vm_menu.sh" ;; - 5) exec bash "$LOCAL_SCRIPTS/menus/storage_menu.sh" ;; - 6) exec bash "$LOCAL_SCRIPTS/menus/menu_Helper_Scripts.sh" ;; - 7) exec bash "$LOCAL_SCRIPTS/menus/network_menu.sh" ;; - 8) exec bash "$LOCAL_SCRIPTS/menus/utilities_menu.sh" ;; - 9) exec bash "$LOCAL_SCRIPTS/menus/config_menu.sh" ;; - 0) clear; msg_ok "$(translate "Thank you for using ProxMenux. Goodbye!")"; rm -f "$TEMP_FILE"; exit 0 ;; - *) msg_warn "$(translate "Invalid option")"; sleep 2 ;; - esac - done -} - -show_menu diff --git a/version.txt b/version.txt index db152789..a5e42829 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.1.8 \ No newline at end of file +1.1.9 \ No newline at end of file