Changes to Config File Logic
This commit is contained in:
parent
6ff773dc3d
commit
0bfa2b0af8
@ -823,16 +823,9 @@ config_file() {
|
|||||||
if [ "$NET" == "dhcp" ]; then
|
if [ "$NET" == "dhcp" ]; then
|
||||||
echo -e "${NETWORK}${BOLD}${DGN}IP Address: ${BGN}DHCP${CL}"
|
echo -e "${NETWORK}${BOLD}${DGN}IP Address: ${BGN}DHCP${CL}"
|
||||||
echo -e "${GATEWAY}${BOLD}${DGN}Gateway IP Address: ${BGN}Default${CL}"
|
echo -e "${GATEWAY}${BOLD}${DGN}Gateway IP Address: ${BGN}Default${CL}"
|
||||||
elif
|
elif [[ "$NET" =~ $ip_cidr_regex ]]; then
|
||||||
[[ "$NET" =~ $ip_cidr_regex ]]
|
|
||||||
then
|
|
||||||
echo -e "${NETWORK}${BOLD}${DGN}IP Address: ${BGN}$NET${CL}"
|
echo -e "${NETWORK}${BOLD}${DGN}IP Address: ${BGN}$NET${CL}"
|
||||||
else
|
if [ ! -z "$GATE" ]; then
|
||||||
msg_error "Invalid IP Address format. Needs to be 0.0.0.0/0, was ${NET}"
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if [ ! -z "$GATE" ] && [ "$NET" != "dhcp" ]; then
|
|
||||||
if [[ "$GATE" =~ $ip_regex ]]; then
|
if [[ "$GATE" =~ $ip_regex ]]; then
|
||||||
echo -e "${GATEWAY}${BOLD}${DGN}Gateway IP Address: ${BGN}$GATE${CL}"
|
echo -e "${GATEWAY}${BOLD}${DGN}Gateway IP Address: ${BGN}$GATE${CL}"
|
||||||
GATE=",gw=$GATE"
|
GATE=",gw=$GATE"
|
||||||
@ -844,6 +837,12 @@ config_file() {
|
|||||||
msg_error "Gateway IP Address cannot be empty"
|
msg_error "Gateway IP Address cannot be empty"
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
msg_error "Invalid IP Address format. Needs to be 0.0.0.0/0, was ${NET}"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
if [[ ! -z "$APT_CACHER_IP" ]]; then
|
if [[ ! -z "$APT_CACHER_IP" ]]; then
|
||||||
if [[ "$APT_CACHER_IP" =~ $ip_regex ]]; then
|
if [[ "$APT_CACHER_IP" =~ $ip_regex ]]; then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user