From 30f5afbf359409dda4b0e45062b51832e0d11623 Mon Sep 17 00:00:00 2001
From: ronivay <roni@vayrynen.info>
Date: Thu, 15 Jul 2021 11:14:03 +0300
Subject: [PATCH] loop network detail inputs instead of exiting

---
 xo-appliance.sh | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/xo-appliance.sh b/xo-appliance.sh
index 9646739..037893d 100755
--- a/xo-appliance.sh
+++ b/xo-appliance.sh
@@ -66,29 +66,29 @@ function NetworkSettings {
 	ipaddress=${ipaddress:-dhcp}
 
 	if [[ "$ipaddress" != "dhcp" ]]; then
-		if ! [[ $ipaddress =~ $ipregex ]]; then
-			echo "Check ip-address format"
-			exit 1
-		fi
+		while ! [[ $ipaddress =~ $ipregex ]]; do
+			echo "Check IP address format"
+			read -r -p "IP address: " ipaddress
+		done
 		read -r -p "Netmask [255.255.255.0]: " netmask
 		netmask=${netmask:-255.255.255.0}
-		if ! [[	$netmask =~ $ipregex ]]; then
-                	echo "Check netmask format"
-                	exit 1
-                fi
+		while ! [[ $netmask =~ $ipregex ]]; do
+			echo "Check gateway format"
+			read -r -p "Netmask [255.255.255.0]: " netmask
+			netmask=${netmask:-255.255.255.0}
+		done
 		read -r -p "Gateway: " gateway
-		if [[ $gateway != "" ]]; then
-			if ! [[ $gateway =~ $ipregex ]]; then
-				echo "Check gateway format"
-				exit 1
-			fi
-		fi
+		while ! [[ $gateway =~ $ipregex ]] && [[ $gateway != "" ]]; do
+			echo "Check gateway format"
+			read -r -p "Gateway: " gateway
+		done
 		read -r -p "DNS [8.8.8.8]: " dns
 		dns=${dns:-8.8.8.8}
-		if ! [[ $dns =~ $ipregex ]]; then
+		while ! [[ $dns =~ $ipregex ]]; do
 			echo "Check dns format"
-			exit 1
-		fi
+			read -r -p "DNS [8.8.8.8]: " dns
+			dns=${dns:-8.8.8.8}
+		done
 
 	fi