From 449ef72bd5c0785f5a84ea054db9d2d7f2b1a078 Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Wed, 19 Mar 2025 09:55:45 +0100
Subject: [PATCH] revert

---
 misc/build.func | 137 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 104 insertions(+), 33 deletions(-)

diff --git a/misc/build.func b/misc/build.func
index 037d181..52a5221 100644
--- a/misc/build.func
+++ b/misc/build.func
@@ -411,52 +411,123 @@ advanced_settings() {
         var_default_os="${var_os}"
         var_os=""
         while [ -z "$var_os" ]; do
-            temp_var_os=$(whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "DISTRIBUTION" --radiolist "Choose Distribution" 10 58 2 \
-                "debian" "" $([ "$var_default_os" == "debian" ] && echo "ON" || echo "OFF") \
-                "ubuntu" "" $([ "$var_default_os" == "ubuntu" ] && echo "ON" || echo "OFF") \
-                3>&1 1>&2 2>&3)
-
-            if [ $? -ne 0 ]; then
-                exit_script
+            if [ "$var_default_os" == "debian" ]; then
+                if var_os=$(whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "DISTRIBUTION" --radiolist "Choose Distribution" 10 58 2 \
+                    "debian" "" ON \
+                    "ubuntu" "" OFF \
+                    3>&1 1>&2 2>&3); then
+                    if [ -n "$var_os" ]; then
+                        echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}$var_os${CL}"
+                    fi
+                else
+                    exit_script
+                fi
             fi
-
-            if [ -n "$temp_var_os" ]; then
-                var_os="$temp_var_os"
-                echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}$var_os${CL}"
+            if [ "$var_default_os" == "ubuntu" ]; then
+                if var_os=$(whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "DISTRIBUTION" --radiolist "Choose Distribution" 10 58 2 \
+                    "debian" "" OFF \
+                    "ubuntu" "" ON \
+                    3>&1 1>&2 2>&3); then
+                    if [ -n "$var_os" ]; then
+                        echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}$var_os${CL}"
+                    fi
+                else
+                    exit_script
+                fi
             fi
         done
     fi
 
-    if [ "$var_os" == "debian" ] || [ "$var_os" == "ubuntu" ]; then
+    if [ "$var_os" == "debian" ]; then
         var_default_version="${var_version}"
         var_version=""
         while [ -z "$var_version" ]; do
-            if [ "$var_os" == "debian" ]; then
-                temp_var_version=$(whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "DEBIAN VERSION" --radiolist "Choose Version" 10 58 2 \
-                    "11" "Bullseye" $([ "$var_default_version" == "11" ] && echo "ON" || echo "OFF") \
-                    "12" "Bookworm" $([ "$var_default_version" == "12" ] && echo "ON" || echo "OFF") \
-                    3>&1 1>&2 2>&3)
-            elif [ "$var_os" == "ubuntu" ]; then
-                temp_var_version=$(whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
-                    "20.04" "Focal" $([ "$var_default_version" == "20.04" ] && echo "ON" || echo "OFF") \
-                    "22.04" "Jammy" $([ "$var_default_version" == "22.04" ] && echo "ON" || echo "OFF") \
-                    "24.04" "Noble" $([ "$var_default_version" == "24.04" ] && echo "ON" || echo "OFF") \
-                    "24.10" "Oracular" $([ "$var_default_version" == "24.10" ] && echo "ON" || echo "OFF") \
-                    3>&1 1>&2 2>&3)
+            if [ "$var_default_version" == "11" ]; then
+                if var_version=$(whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "DEBIAN VERSION" --radiolist "Choose Version" 10 58 2 \
+                    "11" "Bullseye" ON \
+                    "12" "Bookworm" OFF \
+                    3>&1 1>&2 2>&3); then
+                    if [ -n "$var_version" ]; then
+                        echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+                    fi
+                else
+                    exit_script
+                fi
             fi
-
-            if [ $? -ne 0 ]; then
-                exit_script
-            fi
-
-            if [ -n "$temp_var_version" ]; then
-                var_version="$temp_var_version"
-                echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+            if [ "$var_default_version" == "12" ]; then
+                if var_version=$(whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "DEBIAN VERSION" --radiolist "Choose Version" 10 58 2 \
+                    "11" "Bullseye" OFF \
+                    "12" "Bookworm" ON \
+                    3>&1 1>&2 2>&3); then
+                    if [ -n "$var_version" ]; then
+                        echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+                    fi
+                else
+                    exit_script
+                fi
             fi
         done
     fi
 
-
+    if [ "$var_os" == "ubuntu" ]; then
+        var_default_version="${var_version}"
+        var_version=""
+        while [ -z "$var_version" ]; do
+            if [ "$var_default_version" == "20.04" ]; then
+                if var_version=$(whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
+                    "20.04" "Focal" ON \
+                    "22.04" "Jammy" OFF \
+                    "24.04" "Noble" OFF \
+                    "24.10" "Oracular" OFF \
+                    3>&1 1>&2 2>&3); then
+                    if [ -n "$var_version" ]; then
+                        echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+                    fi
+                else
+                    exit_script
+                fi
+            elif [ "$var_default_version" == "22.04" ]; then
+                if var_version=$(whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
+                    "20.04" "Focal" OFF \
+                    "22.04" "Jammy" ON \
+                    "24.04" "Noble" OFF \
+                    "24.10" "Oracular" OFF \
+                    3>&1 1>&2 2>&3); then
+                    if [ -n "$var_version" ]; then
+                        echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+                    fi
+                else
+                    exit_script
+                fi
+            elif [ "$var_default_version" == "24.04" ]; then
+                if var_version=$(whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
+                    "20.04" "Focal" OFF \
+                    "22.04" "Jammy" OFF \
+                    "24.04" "Noble" ON \
+                    "24.10" "Oracular" OFF \
+                    3>&1 1>&2 2>&3); then
+                    if [ -n "$var_version" ]; then
+                        echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+                    fi
+                else
+                    exit_script
+                fi
+            else
+                if var_version=$(whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
+                    "20.04" "Focal" OFF \
+                    "22.04" "Jammy" OFF \
+                    "24.04" "Noble" OFF \
+                    "24.10" "Oracular" ON \
+                    3>&1 1>&2 2>&3); then
+                    if [ -n "$var_version" ]; then
+                        echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+                    fi
+                else
+                    exit_script
+                fi
+            fi
+        done
+    fi
     # Setting Default Tag for Advanced Settings
     TAGS="community-script-dev;${var_tags:-}"
     CT_DEFAULT_TYPE="${CT_TYPE}"