fix pve-manager triggering mechanism (#187)

* fix pve-manager triggering mechanism

* move pve auto re patch to install option

* revert back to case options and only allow one at the to be selected. Preserve config for each option

---------

Co-authored-by: Meliox <na>

debian/pve-mod.triggers

@@ -1 +1,2 @@
-interest pve-manager
+interest-noawait /usr/share/pve-manager/js
+interest-noawait /usr/share/perl5/PVE

src/Scripts/pve-mod-configure

@@ -24,31 +24,59 @@ ask()  {
 }
 bool() { [[ "$1" == true ]] && echo 1 || echo 0; }
 
-_load_conf_debug() {
+# Loads every value from an existing config file into the wizard's variables,
+# so that re-running the tool preserves settings the user does not change.
+_load_conf() {
     [[ -f "$CONF_FILE" ]] || return 0
-    local in_debug=0 line key val
+    local section="" line key val
     while IFS= read -r line; do
         case "$line" in
-            '[debug]') in_debug=1; continue ;;
-            '['*']')   in_debug=0; continue ;;
             '#'*|'')   continue ;;
+            '['*']')   section="${line#[}"; section="${section%]}"; continue ;;
         esac
-        [[ "$in_debug" -eq 0 ]] && continue
+        [[ "$line" == *=* ]] || continue
         key="${line%%=*}"; val="${line#*=}"
-        case "$key" in
+        case "${section}.${key}" in
-            lm_sensors_mode)        DEBUG_LM_SENSORS="$val" ;;
+            # [modules]
-            lm_sensors_output_file) DEBUG_LM_SENSORS_FILE="$val" ;;
+            modules.node_info)              MOD_NODE_INFO="$val" ;;
-            intel_mode)             DEBUG_INTEL="$val" ;;
+            modules.nag_screen)             MOD_NAG_SCREEN="$val" ;;
-            intel_devices_file)     DEBUG_INTEL_FILE="$val" ;;
+            # [gpu]
-            nvidia_mode)            DEBUG_NVIDIA="$val" ;;
+            gpu.intel_enabled)              ENABLE_INTEL_GPU_INFO="$val" ;;
-            nvidia_devices_file)    DEBUG_NVIDIA_DEVICES_FILE="$val" ;;
+            gpu.nvidia_enabled)             ENABLE_NVIDIA_GPU_INFO="$val" ;;
-            nvidia_output_file)     DEBUG_NVIDIA_OUTPUT_FILE="$val" ;;
+            gpu.amd_enabled)                ENABLE_AMD_GPU_INFO="$val" ;;
-            amd_mode)               DEBUG_AMD="$val" ;;
+            gpu.gpu_history)                ENABLE_GPU_HISTORY="$val" ;;
-            amd_devices_file)       DEBUG_AMD_FILE="$val" ;;
+            # [lm_sensors]
-            ups_mode)               DEBUG_UPS="$val" ;;
+            lm_sensors.enabled)             LM_SENSORS_ENABLED="$val" ;;
-            ups_output_file)        DEBUG_UPS_FILE="$val" ;;
+            lm_sensors.enable_cpu)          ENABLE_CPU="$val" ;;
-            log_enabled)            DEBUG_LOG="$val" ;;
+            lm_sensors.cpu_temp_target)     CPU_TEMP_TARGET="$val" ;;
-            log_file)               DEBUG_LOG_FILE="$val" ;;
+            lm_sensors.enable_ram_temp)     ENABLE_RAM_TEMP="$val" ;;
+            lm_sensors.enable_hdd_temp)     ENABLE_HDD_TEMP="$val" ;;
+            lm_sensors.enable_nvme_temp)    ENABLE_NVME_TEMP="$val" ;;
+            lm_sensors.enable_fan_speed)    ENABLE_FAN_SPEED="$val" ;;
+            lm_sensors.display_zero_speed_fans) DISPLAY_ZERO_SPEED_FANS="$val" ;;
+            lm_sensors.temp_unit)           TEMP_UNIT="$val" ;;
+            # [ups]
+            ups.enabled)                    ENABLE_UPS="$val" ;;
+            ups.device_name)                UPS_DEVICE_NAME="$val" ;;
+            # [system_info]
+            system_info.enabled)            ENABLE_SYSTEM_INFO="$val" ;;
+            system_info.type)               SYSTEM_INFO_TYPE="$val" ;;
+            # [pve_trigger]
+            pve_trigger.enabled)            PVE_TRIGGER_ENABLED="$val" ;;
+            # [debug]
+            debug.lm_sensors_mode)          DEBUG_LM_SENSORS="$val" ;;
+            debug.lm_sensors_output_file)   DEBUG_LM_SENSORS_FILE="$val" ;;
+            debug.intel_mode)               DEBUG_INTEL="$val" ;;
+            debug.intel_devices_file)       DEBUG_INTEL_FILE="$val" ;;
+            debug.nvidia_mode)              DEBUG_NVIDIA="$val" ;;
+            debug.nvidia_devices_file)      DEBUG_NVIDIA_DEVICES_FILE="$val" ;;
+            debug.nvidia_output_file)       DEBUG_NVIDIA_OUTPUT_FILE="$val" ;;
+            debug.amd_mode)                 DEBUG_AMD="$val" ;;
+            debug.amd_devices_file)         DEBUG_AMD_FILE="$val" ;;
+            debug.ups_mode)                 DEBUG_UPS="$val" ;;
+            debug.ups_output_file)          DEBUG_UPS_FILE="$val" ;;
+            debug.log_enabled)              DEBUG_LOG="$val" ;;
+            debug.log_file)                 DEBUG_LOG_FILE="$val" ;;
         esac
     done < "$CONF_FILE"
 }
@@ -542,50 +570,42 @@ main() {
     DEBUG_AMD=0;        DEBUG_AMD_FILE="/tmp/amd-gpu-devices.json"
     DEBUG_UPS=0;        DEBUG_UPS_FILE="/tmp/ups-output.json"
     DEBUG_LOG=0;        DEBUG_LOG_FILE="/tmp/pve-mod-debug.log"
-    _load_conf_debug
+    _load_conf
 
-    # ── Module selection ──────────────────────────────────────────────────────
+    # ── Module / feature selection ────────────────────────────────────────────
+    # Existing settings are loaded above; the user picks ONE option to (re)configure
+    # this run, and all other options retain their previously saved values.
     msgb "\n=== pve-mod Module Selection ==="
-    echo "Available modules:"
+    echo "Available options (select one):"
     echo "  [1] Node Info   — sensor readings, GPU stats, UPS, system information"
     echo "  [2] Nag Screen  — remove Proxmox subscription nag screen"
-    echo "  [3] Both"
+    echo "  [3] Auto re-patch on PVE upgrade — automatically re-apply patches when"
+    echo "                    pve-manager is upgraded"
     echo "  [n] None / cancel"
     local modChoice
-    modChoice=$(ask "Select modules to enable (1/2/3/n)")
+    modChoice=$(ask "Select an option to enable (1/2/3/n)")
     case "$modChoice" in
-        1)    MOD_NODE_INFO=1 ;;
+        1)
-        2)    MOD_NAG_SCREEN=1 ;;
+            MOD_NODE_INFO=1
-        3)    MOD_NODE_INFO=1; MOD_NAG_SCREEN=1 ;;
-        [nN]) info "No modules selected. Exiting."; exit 0 ;;
-        *)    warn "Invalid selection. Defaulting to Node Info only."; MOD_NODE_INFO=1 ;;
-    esac
-
-    # ── Per-module wizards ────────────────────────────────────────────────────
-    if [[ "$MOD_NODE_INFO" -eq 1 ]]; then
             msgb "\n=== Node Info Configuration ==="
             configure_node_info
-    fi
+            ;;
-
+        2)
-    if [[ "$MOD_NAG_SCREEN" -eq 1 ]]; then
+            MOD_NAG_SCREEN=1
             msgb "\n=== Nag Screen ==="
             info "Subscription nag screen removal will be applied."
-    fi
+            ;;
+        3)
+            PVE_TRIGGER_ENABLED=1
+            info "Auto re-patching on PVE upgrade enabled."
+            ;;
+        [nN]) info "No option selected. Exiting."; exit 0 ;;
+        *)    warn "Invalid selection. Exiting."; exit 0 ;;
+    esac
 
     # ── Debug mode ────────────────────────────────────────────────────────────
     configure_debug
 
-    # ── Re-patch on PVE upgrade ───────────────────────────────────────────────
-    msgb "\n=== Auto Re-patching on PVE Upgrade ==="
-    echo "pve-mod registers a dpkg trigger on pve-manager. When pve-manager is"
-    echo "upgraded, the trigger fires and can automatically re-apply patches."
-    local triggerChoice
-    triggerChoice=$(ask "Re-apply patches automatically when pve-manager upgrades? (y/N)")
-    case "$triggerChoice" in
-        [yY]) PVE_TRIGGER_ENABLED=1; info "Auto re-patching enabled." ;;
-        *)    PVE_TRIGGER_ENABLED=0; info "Auto re-patching disabled. Run 'pve-mod-configure' after a PVE upgrade." ;;
-    esac
-
     # ── Write config and apply ────────────────────────────────────────────────
     write_config