diff --git a/misc/build.func b/misc/build.func index e56e56b..4c11e09 100644 --- a/misc/build.func +++ b/misc/build.func @@ -558,51 +558,41 @@ advanced_settings() { TAGS="community-script-dev;${var_tags:-}" CT_DEFAULT_TYPE="${CT_TYPE}" CT_TYPE="" - - TMP_OUTPUT_FILE=$(mktemp) - trap 'rm -f "$TMP_OUTPUT_FILE"' EXIT - while [ -z "$CT_TYPE" ]; do - TITLE="CONTAINER TYPE" - BACKTITLE="[dev] Proxmox VE Helper Scripts" - HEIGHT=10 - WIDTH=58 - MENU_HEIGHT=2 - if [ "$CT_DEFAULT_TYPE" == "1" ]; then - DEFAULT_ON="ON" - DEFAULT_OFF="OFF" - else - DEFAULT_ON="OFF" - DEFAULT_OFF="ON" + if CT_TYPE=$(whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \ + "1" "Unprivileged" ON \ + "0" "Privileged" OFF \ + 3>&1 1>&2 2>&3); then + if [ -n "$CT_TYPE" ]; then + CT_TYPE_DESC="Unprivileged" + if [ "$CT_TYPE" -eq 0 ]; then + CT_TYPE_DESC="Privileged" + fi + echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}$var_os${CL}" + echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}" + echo -e "${CONTAINERTYPE}${BOLD}${DGN}Container Type: ${BGN}$CT_TYPE_DESC${CL}" + fi + else + exit_script + fi fi - - whiptail --backtitle "$BACKTITLE" --title "$TITLE" \ - --radiolist "Choose Type" $HEIGHT $WIDTH $MENU_HEIGHT \ - "1" "Unprivileged" $DEFAULT_ON \ - "0" "Privileged" $DEFAULT_OFF \ - 3>&1 1>"$TMP_OUTPUT_FILE" 2>&3 - - RET=$? - - if [ $RET -ne 0 ]; then - exit_script + if [ "$CT_DEFAULT_TYPE" == "0" ]; then + if CT_TYPE=$(whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \ + "1" "Unprivileged" OFF \ + "0" "Privileged" ON \ + 3>&1 1>&2 2>&3); then + if [ -n "$CT_TYPE" ]; then + CT_TYPE_DESC="Unprivileged" + if [ "$CT_TYPE" -eq 0 ]; then + CT_TYPE_DESC="Privileged" + fi + echo -e "${CONTAINERTYPE}${BOLD}${DGN}Container Type: ${BGN}$CT_TYPE_DESC${CL}" + fi + else + exit_script + fi fi - - CT_TYPE=$(<"$TMP_OUTPUT_FILE") - - if [ "$CT_TYPE" == "0" ]; then - CT_TYPE_DESC="Privileged" - elif [ "$CT_TYPE" == "1" ]; then - CT_TYPE_DESC="Unprivileged" - else - CT_TYPE="" - continue - fi - - echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}$var_os${CL}" - echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}" - echo -e "${CONTAINERTYPE}${BOLD}${DGN}Container Type: ${BGN}$CT_TYPE_DESC${CL}" done while true; do