Compare commits

...

2 Commits

Author SHA1 Message Date
tteckster 325071c2f1
Update build.func
shfmt
2023-05-11 14:15:10 -04:00
tteckster 71eecd1efc
Update build.func
improve whiptail menu
2023-05-11 14:04:12 -04:00
1 changed files with 22 additions and 26 deletions

View File

@ -268,32 +268,23 @@ advanced_settings() {
fi fi
done done
while true; do if [ "$NET" != "dhcp" ]; then
GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3) while true; do
exit_status=$? GATE1=$(whiptail --inputbox "Enter gateway IP address" 8 58 --title "Gateway IP" 3>&1 1>&2 2>&3)
if [ $exit_status -eq 0 ]; then
if [ -z "$GATE1" ]; then if [ -z "$GATE1" ]; then
if [ "$NET" = "dhcp" ]; then whiptail --msgbox "Gateway IP address cannot be empty" 8 58
GATE1="Default" elif [[ ! "$GATE1" =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]]; then
GATE="" whiptail --msgbox "Invalid IP address format" 8 58
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 else
if [[ "$GATE1" =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]]; then GATE=",gw=$GATE1"
GATE=",gw=$GATE1" echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}" break
break
else
whiptail --msgbox "Invalid IP address. Please enter a valid IP address." 8 58
fi
fi fi
else done
exit-script else
fi GATE=""
done 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