holm/Proxmox
1
1
Fork 0
forked from extern/Proxmox
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update build.func

Browse Source 
improve whiptail menu
This commit is contained in:
tteckster 2023-05-11 14:04:12 -04:00 committed by GitHub
parent 9e9b8286ad
commit 71eecd1efc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
misc/build.func
View File

@ -268,32 +268,23 @@ advanced_settings() {
fi fi
done done
if [ "$NET" != "dhcp" ]; then
while true; do while true; do
GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3) GATE1=$(whiptail --inputbox "Enter gateway IP address" 8 58 --title "Gateway IP" 3>&1 1>&2 2>&3)
exit_status=$? if [ -z "$GATE1" ]; then
if [ $exit_status -eq 0 ]; then whiptail --msgbox "Gateway IP address cannot be empty" 8 58
if [ -z "$GATE1" ]; then elif [[ ! "$GATE1" =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]]; then
if [ "$NET" = "dhcp" ]; then whiptail --msgbox "Invalid IP address format" 8 58
GATE1="Default"
GATE=""
echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
break
else
whiptail --msgbox "Since a static IP was used, a gateway IP address is mandatory." 8 58
fi
else
if [[ "$GATE1" =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]]; then
GATE=",gw=$GATE1"
echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
break
else
whiptail --msgbox "Invalid IP address. Please enter a valid IP address." 8 58
fi
fi
else else
exit-script GATE=",gw=$GATE1"
echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
break
fi fi
done done
else
GATE=""
echo -e "${DGN}Using Gateway IP Address: ${BGN}Default${CL}"
fi
if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
DISABLEIP6="yes" DISABLEIP6="yes"
@ -363,12 +354,17 @@ advanced_settings() {
exit-script exit-script
fi fi
if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then if [[ "$PW" == -password* ]]; then
SSH="yes" if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
SSH="yes"
else
SSH="no"
fi
echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
else else
SSH="no" SSH="no"
echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
fi fi
echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
if [[ "$APP" == "Docker" || "$APP" == "Umbrel" || "$APP" == "CasaOS" || "$APP" == "Home Assistant" ]]; then if [[ "$APP" == "Docker" || "$APP" == "Umbrel" || "$APP" == "CasaOS" || "$APP" == "Home Assistant" ]]; then
if (whiptail --defaultno --title "FUSE OVERLAYFS" --yesno "(ZFS) Enable Fuse Overlayfs?" 10 58); then if (whiptail --defaultno --title "FUSE OVERLAYFS" --yesno "(ZFS) Enable Fuse Overlayfs?" 10 58); then