Skip to content

Commit 81c327c

Browse files
michelroegl-brunnermichelroegl-brunner
authored
[core] Update build.func: Add defaults to Advanced mode (#1548)
* [core] Update build.func: Add defaults to Advanced mode * Change method * Fix copy mistake
1 parent c9eb13a commit 81c327c

File tree

1 file changed

+138
-45
lines changed

1 file changed

+138
-45
lines changed

‎misc/build.func‎

Lines changed: 138 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -382,74 +382,167 @@ exit_script() {
382382
# This function allows the user to configure advanced settings for the script.
383383
advanced_settings() {
384384
whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox --title "Here is an instructional tip:" "To make a selection, use the Spacebar." 8 58
385-
whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox --title "Default distribution for $APP" "${var_os} ${var_version} \n \nIf the default Linux distribution is not adhered to, script support will be discontinued. \n" 10 58
386-
if [ "$var_os" != "alpine" ]; then
385+
whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox --title "Default distribution for $APP" "Default is: ${var_os} ${var_version} \n \nIf the default Linux distribution is not adhered to, script support will be discontinued. \n" 10 58
386+
if [ "$var_os" != "alpine" ]; then
387+
var_default_os="${var_os}"
387388
var_os=""
388389
while [ -z "$var_os" ]; do
389-
if var_os=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DISTRIBUTION" --radiolist "Choose Distribution:" 10 58 2 \
390-
"debian" "" OFF \
391-
"ubuntu" "" OFF \
392-
3>&1 1>&2 2>&3); then
393-
if [ -n "$var_os" ]; then
394-
echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}$var_os${CL}"
390+
if [ "$var_default_os" == "debian" ]; then
391+
if var_os=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DISTRIBUTION" --radiolist "Choose Distribution" 10 58 2 \
392+
"debian" "" ON \
393+
"ubuntu" "" OFF \
394+
3>&1 1>&2 2>&3); then
395+
if [ -n "$var_os" ]; then
396+
echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}$var_os${CL}"
397+
fi
398+
else
399+
exit_script
400+
fi
401+
fi
402+
if [ "$var_default_os" == "ubuntu" ]; then
403+
if var_os=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DISTRIBUTION" --radiolist "Choose Distribution" 10 58 2 \
404+
"debian" "" OFF \
405+
"ubuntu" "" ON \
406+
3>&1 1>&2 2>&3); then
407+
if [ -n "$var_os" ]; then
408+
echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}$var_os${CL}"
409+
fi
410+
else
411+
exit_script
412+
fi
395413
fi
396-
else
397-
exit_script
398-
fi
399414
done
400415
fi
401416

402417
if [ "$var_os" == "debian" ]; then
418+
var_default_version="${var_version}"
403419
var_version=""
404420
while [ -z "$var_version" ]; do
405-
if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DEBIAN VERSION" --radiolist "Choose Version" 10 58 2 \
406-
"11" "Bullseye" OFF \
407-
"12" "Bookworm" OFF \
408-
3>&1 1>&2 2>&3); then
409-
if [ -n "$var_version" ]; then
410-
echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
421+
if [ "$var_default_version" == "11" ]; then
422+
if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DEBIAN VERSION" --radiolist "Choose Version" 10 58 2 \
423+
"11" "Bullseye" ON \
424+
"12" "Bookworm" OFF \
425+
3>&1 1>&2 2>&3); then
426+
if [ -n "$var_version" ]; then
427+
echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
428+
fi
429+
else
430+
exit_script
431+
fi
432+
fi
433+
if [ "$var_default_version" == "12" ]; then
434+
if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DEBIAN VERSION" --radiolist "Choose Version" 10 58 2 \
435+
"11" "Bullseye" OFF \
436+
"12" "Bookworm" ON \
437+
3>&1 1>&2 2>&3); then
438+
if [ -n "$var_version" ]; then
439+
echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
440+
fi
441+
else
442+
exit_script
411443
fi
412-
else
413-
exit_script
414444
fi
415445
done
416446
fi
417447

418448
if [ "$var_os" == "ubuntu" ]; then
449+
var_default_version="${var_version}"
419450
var_version=""
420451
while [ -z "$var_version" ]; do
421-
if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
422-
"20.04" "Focal" OFF \
423-
"22.04" "Jammy" OFF \
424-
"24.04" "Noble" OFF \
425-
"24.10" "Oracular" OFF \
426-
3>&1 1>&2 2>&3); then
427-
if [ -n "$var_version" ]; then
428-
echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
452+
if [ "$var_default_version" == "20.04" ]; then
453+
if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
454+
"20.04" "Focal" ON \
455+
"22.04" "Jammy" OFF \
456+
"24.04" "Noble" OFF \
457+
"24.10" "Oracular" OFF \
458+
3>&1 1>&2 2>&3); then
459+
if [ -n "$var_version" ]; then
460+
echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
461+
fi
462+
else
463+
exit_script
464+
fi
465+
fi
466+
if [ "$var_default_version" == "22.04" ]; then
467+
if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
468+
"20.04" "Focal" OFF \
469+
"22.04" "Jammy" ON \
470+
"24.04" "Noble" OFF \
471+
"24.10" "Oracular" OFF \
472+
3>&1 1>&2 2>&3); then
473+
if [ -n "$var_version" ]; then
474+
echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
475+
fi
476+
else
477+
exit_script
478+
fi
479+
fi
480+
if [ "$var_default_version" == "24.04" ]; then
481+
if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
482+
"20.04" "Focal" OFF \
483+
"22.04" "Jammy" OFF \
484+
"24.04" "Noble" ON \
485+
"24.10" "Oracular" OFF \
486+
3>&1 1>&2 2>&3); then
487+
if [ -n "$var_version" ]; then
488+
echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
489+
fi
490+
else
491+
exit_script
492+
fi
493+
fi
494+
if [ "$var_default_version" == "24.10" ]; then
495+
if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
496+
"20.04" "Focal" OFF \
497+
"22.04" "Jammy" OFF \
498+
"24.04" "Noble" OFF \
499+
"24.10" "Oracular" ON \
500+
3>&1 1>&2 2>&3); then
501+
if [ -n "$var_version" ]; then
502+
echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
503+
fi
504+
else
505+
exit_script
429506
fi
430-
else
431-
exit_script
432507
fi
433508
done
434509
fi
435510
# Setting Default Tag for Advanced Settings
436511
TAGS="community-script;${var_tags:-}"
437-
512+
CT_DEFAULT_TYPE="${CT_TYPE}"
438513
CT_TYPE=""
439514
while [ -z "$CT_TYPE" ]; do
440-
if CT_TYPE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
441-
"1" "Unprivileged" OFF \
442-
"0" "Privileged" OFF \
443-
3>&1 1>&2 2>&3); then
444-
if [ -n "$CT_TYPE" ]; then
445-
CT_TYPE_DESC="Unprivileged"
446-
if [ "$CT_TYPE" -eq 0 ]; then
447-
CT_TYPE_DESC="Privileged"
515+
if [ "$CT_DEFAULT_TYPE" == "1" ]; then
516+
if CT_TYPE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
517+
"1" "Unprivileged" ON \
518+
"0" "Privileged" OFF \
519+
3>&1 1>&2 2>&3); then
520+
if [ -n "$CT_TYPE" ]; then
521+
CT_TYPE_DESC="Unprivileged"
522+
if [ "$CT_TYPE" -eq 0 ]; then
523+
CT_TYPE_DESC="Privileged"
524+
fi
525+
echo -e "${CONTAINERTYPE}${BOLD}${DGN}Container Type: ${BGN}$CT_TYPE_DESC${CL}"
448526
fi
449-
echo -e "${CONTAINERTYPE}${BOLD}${DGN}Container Type: ${BGN}$CT_TYPE_DESC${CL}"
527+
else
528+
exit_script
529+
fi
530+
fi
531+
if [ "$CT_DEFAULT_TYPE" == "0" ]; then
532+
if CT_TYPE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
533+
"1" "Unprivileged" OFF \
534+
"0" "Privileged" ON \
535+
3>&1 1>&2 2>&3); then
536+
if [ -n "$CT_TYPE" ]; then
537+
CT_TYPE_DESC="Unprivileged"
538+
if [ "$CT_TYPE" -eq 0 ]; then
539+
CT_TYPE_DESC="Privileged"
540+
fi
541+
echo -e "${CONTAINERTYPE}${BOLD}${DGN}Container Type: ${BGN}$CT_TYPE_DESC${CL}"
542+
fi
543+
else
544+
exit_script
450545
fi
451-
else
452-
exit_script
453546
fi
454547
done
455548

@@ -597,7 +690,7 @@ advanced_settings() {
597690
APT_CACHER=""
598691
APT_CACHER_IP=""
599692
else
600-
if APT_CACHER_IP=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set APT-Cacher IP (leave blank for default)" 8 58 --title "APT-Cacher IP" 3>&1 1>&2 2>&3); then
693+
if APT_CACHER_IP=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set APT-Cacher IP (leave blank for none)" 8 58 --title "APT-Cacher IP" 3>&1 1>&2 2>&3); then
601694
APT_CACHER="${APT_CACHER_IP:+yes}"
602695
echo -e "${NETWORK}${BOLD}${DGN}APT-Cacher IP Address: ${BGN}${APT_CACHER_IP:-Default}${CL}"
603696
else
@@ -612,7 +705,7 @@ advanced_settings() {
612705
fi
613706
echo -e "${DISABLEIPV6}${BOLD}${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
614707

615-
if MTU1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
708+
if MTU1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Interface MTU Size (leave blank for default [1500])" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
616709
if [ -z $MTU1 ]; then
617710
MTU1="Default"
618711
MTU=""
@@ -649,7 +742,7 @@ advanced_settings() {
649742
exit_script
650743
fi
651744

652-
if MAC1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
745+
if MAC1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a MAC Address(leave blank for generated MAC)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
653746
if [ -z $MAC1 ]; then
654747
MAC1="Default"
655748
MAC=""
@@ -661,7 +754,7 @@ advanced_settings() {
661754
exit_script
662755
fi
663756

664-
if VLAN1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
757+
if VLAN1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a Vlan(leave blank for no VLAN)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
665758
if [ -z $VLAN1 ]; then
666759
VLAN1="Default"
667760
VLAN=""

0 commit comments

Comments
 (0)