From 03dcdfb2fbd777dbad08846fa0a478ffb5068b44 Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Tue, 22 Jul 2025 11:05:24 +0200
Subject: [PATCH] Update build.func

---
 misc/build.func | 174 ++++++++++++++++++++++++++----------------------
 1 file changed, 95 insertions(+), 79 deletions(-)

diff --git a/misc/build.func b/misc/build.func
index 4d8e759a..61ba50dc 100644
--- a/misc/build.func
+++ b/misc/build.func
@@ -998,95 +998,111 @@ install_script() {
   if systemctl is-active -q ping-instances.service; then
     systemctl -q stop ping-instances.service
   fi
+
   NEXTID=$(pvesh get /cluster/nextid)
   timezone=$(cat /etc/timezone)
   header_info
-  while true; do
 
-    TMP_CHOICE=$(whiptail --backtitle "[dev] Proxmox VE Helper Scripts" \
-      --title "SETTINGS" \
-      --menu "Choose an option:" 20 60 7 \
-      "1" "Default Settings" \
-      "2" "Default Settings (with verbose)" \
-      "3" "Advanced Settings" \
-      "4" "Use Config File" \
-      "5" "Manage Default Storage" \
-      "6" "Diagnostic Settings" \
-      "7" "Exit" \
-      --default-item "1" 3>&1 1>&2 2>&3) || true
-
-    if [ -z "$TMP_CHOICE" ]; then
-      echo -e "\n${CROSS}${RD}Menu canceled. Exiting script.${CL}\n"
-      exit 0
-    fi
-
-    CHOICE="$TMP_CHOICE"
-
-    case $CHOICE in
-    1)
-      header_info
-      echo -e "${DEFAULT}${BOLD}${BL}Using Default Settings on node $PVEHOST_NAME${CL}"
-      VERBOSE="no"
-      METHOD="default"
-      base_settings "$VERBOSE"
-      echo_default
-      break
+  # --- PRESET support ---
+  if [ -n "${PRESET:-}" ]; then
+    case "$PRESET" in
+    DEFAULT | default | 1)
+      CHOICE="1"
       ;;
-    2)
-      header_info
-      echo -e "${DEFAULT}${BOLD}${BL}Using Default Settings on node $PVEHOST_NAME (${VERBOSE_CROPPED}Verbose)${CL}"
-      VERBOSE="yes"
-      METHOD="default"
-      base_settings "$VERBOSE"
-      echo_default
-      break
+    VERBOSE | verbose | 2)
+      CHOICE="2"
       ;;
-    3)
-      header_info
-      echo -e "${ADVANCED}${BOLD}${RD}Using Advanced Settings on node $PVEHOST_NAME${CL}"
-      METHOD="advanced"
-      base_settings
-      advanced_settings
-      break
-      ;;
-    4)
-      header_info
-      echo -e "${INFO}${HOLD} ${GN}Using Config File on node $PVEHOST_NAME${CL}"
-      METHOD="advanced"
-      source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/config-file.func)
-      config_file
-      break
-      ;;
-
-    5)
-      manage_default_storage
-      ;;
-    6)
-      if [[ $DIAGNOSTICS == "yes" ]]; then
-        if whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "DIAGNOSTICS SETTINGS" --yesno "Send Diagnostics of LXC Installation?\n\nCurrent setting: ${DIAGNOSTICS}" 10 58 \
-          --yes-button "No" --no-button "Back"; then
-          DIAGNOSTICS="no"
-          sed -i 's/^DIAGNOSTICS=.*/DIAGNOSTICS=no/' /usr/local/community-scripts/diagnostics
-          whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "DIAGNOSTICS SETTINGS" --msgbox "Diagnostics settings changed to ${DIAGNOSTICS}." 8 58
-        fi
-      else
-        if whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "DIAGNOSTICS SETTINGS" --yesno "Send Diagnostics of LXC Installation?\n\nCurrent setting: ${DIAGNOSTICS}" 10 58 \
-          --yes-button "Yes" --no-button "Back"; then
-          DIAGNOSTICS="yes"
-          sed -i 's/^DIAGNOSTICS=.*/DIAGNOSTICS=yes/' /usr/local/community-scripts/diagnostics
-          whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "DIAGNOSTICS SETTINGS" --msgbox "Diagnostics settings changed to ${DIAGNOSTICS}." 8 58
-        fi
-      fi
-      ;;
-    7)
-      echo -e "\n${CROSS}${RD}Script terminated. Have a great day!${CL}\n"
-      exit 0
+    ADVANCED | advanced | 3)
+      CHOICE="3"
       ;;
     *)
-      echo -e "${CROSS}${RD}Invalid option, please try again.${CL}"
+      echo -e "\n${CROSS}${RD}Invalid PRESET value: ${PRESET}${CL}\n"
+      exit 1
       ;;
     esac
-  done
+  else
+    while true; do
+      TMP_CHOICE=$(whiptail --backtitle "[dev] Proxmox VE Helper Scripts" \
+        --title "SETTINGS" \
+        --menu "Choose an option:" 20 60 7 \
+        "1" "Default Settings" \
+        "2" "Default Settings (with verbose)" \
+        "3" "Advanced Settings" \
+        "4" "Use Config File" \
+        "5" "Manage Default Storage" \
+        "6" "Diagnostic Settings" \
+        "7" "Exit" \
+        --default-item "1" 3>&1 1>&2 2>&3) || true
+
+      if [ -z "$TMP_CHOICE" ]; then
+        echo -e "\n${CROSS}${RD}Menu canceled. Exiting script.${CL}\n"
+        exit 0
+      fi
+
+      CHOICE="$TMP_CHOICE"
+      break
+    done
+  fi
+
+  case $CHOICE in
+  1)
+    header_info
+    echo -e "${DEFAULT}${BOLD}${BL}Using Default Settings on node $PVEHOST_NAME${CL}"
+    VERBOSE="no"
+    METHOD="default"
+    base_settings "$VERBOSE"
+    echo_default
+    ;;
+  2)
+    header_info
+    echo -e "${DEFAULT}${BOLD}${BL}Using Default Settings on node $PVEHOST_NAME (${VERBOSE_CROPPED}Verbose)${CL}"
+    VERBOSE="yes"
+    METHOD="default"
+    base_settings "$VERBOSE"
+    echo_default
+    ;;
+  3)
+    header_info
+    echo -e "${ADVANCED}${BOLD}${RD}Using Advanced Settings on node $PVEHOST_NAME${CL}"
+    METHOD="advanced"
+    base_settings
+    advanced_settings
+    ;;
+  4)
+    header_info
+    echo -e "${INFO}${HOLD} ${GN}Using Config File on node $PVEHOST_NAME${CL}"
+    METHOD="advanced"
+    source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/config-file.func)
+    config_file
+    ;;
+  5)
+    manage_default_storage
+    ;;
+  6)
+    if [[ $DIAGNOSTICS == "yes" ]]; then
+      if whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "DIAGNOSTICS SETTINGS" --yesno "Send Diagnostics of LXC Installation?\n\nCurrent setting: ${DIAGNOSTICS}" 10 58 \
+        --yes-button "No" --no-button "Back"; then
+        DIAGNOSTICS="no"
+        sed -i 's/^DIAGNOSTICS=.*/DIAGNOSTICS=no/' /usr/local/community-scripts/diagnostics
+        whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "DIAGNOSTICS SETTINGS" --msgbox "Diagnostics settings changed to ${DIAGNOSTICS}." 8 58
+      fi
+    else
+      if whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "DIAGNOSTICS SETTINGS" --yesno "Send Diagnostics of LXC Installation?\n\nCurrent setting: ${DIAGNOSTICS}" 10 58 \
+        --yes-button "Yes" --no-button "Back"; then
+        DIAGNOSTICS="yes"
+        sed -i 's/^DIAGNOSTICS=.*/DIAGNOSTICS=yes/' /usr/local/community-scripts/diagnostics
+        whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "DIAGNOSTICS SETTINGS" --msgbox "Diagnostics settings changed to ${DIAGNOSTICS}." 8 58
+      fi
+    fi
+    ;;
+  7)
+    echo -e "\n${CROSS}${RD}Script terminated. Have a great day!${CL}\n"
+    exit 0
+    ;;
+  *)
+    echo -e "${CROSS}${RD}Invalid option, please try again.${CL}"
+    ;;
+  esac
 }
 
 check_container_resources() {