Fix Indents

Author: roganlynch

net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh

@@ -685,28 +685,13 @@ do_transfer() {
 	[ -z "$bind_network" ] && [ "$ip_source" = "network" ] && [ "$ip_network" ] && bind_network="$ip_network"
 
 	# Check if URL host supports IPv6 when use_ipv6 is enabled
-<<<<<<< Updated upstream
-	if [ $use_ipv6 -eq 1 ]; then
-=======
 	if [ "$use_ipv6" -eq 1 ]; then
->>>>>>> Stashed changes
 		# Extract hostname from URL
 		__URL_HOST=$(echo "$__URL" | sed -e 's|^[^/]*//||' -e 's|/.*$||' -e 's|:.*$||')
 		__DNS_HAS_AAAA=0
 
 		# Try to resolve IPv6 address for the host
 		if [ -n "$BIND_HOST" ]; then
-<<<<<<< Updated upstream
-			$BIND_HOST -t AAAA "$__URL_HOST" >$DATFILE 2>$ERRFILE && grep -q "has IPv6 address" $DATFILE && __DNS_HAS_AAAA=1
-		elif [ -n "$KNOT_HOST" ]; then
-			$KNOT_HOST -t AAAA "$__URL_HOST" >$DATFILE 2>$ERRFILE && grep -q "has IPv6 address" $DATFILE && __DNS_HAS_AAAA=1
-		elif [ -n "$DRILL" ]; then
-			$DRILL AAAA "$__URL_HOST" >$DATFILE 2>$ERRFILE && grep -E "^$__URL_HOST\.|^$__URL_HOST[[:space:]]" $DATFILE | grep -q "$IPV6_REGEX" && __DNS_HAS_AAAA=1
-		elif [ -n "$HOSTIP" ]; then
-			$HOSTIP -6 "$__URL_HOST" >$DATFILE 2>$ERRFILE && grep -q "$IPV6_REGEX" $DATFILE && __DNS_HAS_AAAA=1
-		elif [ -n "$NSLOOKUP" ]; then
-			$NSLOOKUP "$__URL_HOST" >$DATFILE 2>$ERRFILE && grep -q "$IPV6_REGEX" $DATFILE && __DNS_HAS_AAAA=1
-=======
 			$BIND_HOST -t AAAA "$__URL_HOST" >"$DATFILE" 2>"$ERRFILE" && grep -q "has IPv6 address" "$DATFILE" && __DNS_HAS_AAAA=1
 		elif [ -n "$KNOT_HOST" ]; then
 			$KNOT_HOST -t AAAA "$__URL_HOST" >"$DATFILE" 2>"$ERRFILE" && grep -q "has IPv6 address" "$DATFILE" && __DNS_HAS_AAAA=1
@@ -716,7 +701,6 @@ do_transfer() {
 			$HOSTIP -6 "$__URL_HOST" >"$DATFILE" 2>"$ERRFILE" && grep -q "$IPV6_REGEX" "$DATFILE" && __DNS_HAS_AAAA=1
 		elif [ -n "$NSLOOKUP" ]; then
 			$NSLOOKUP "$__URL_HOST" >"$DATFILE" 2>"$ERRFILE" && grep -q "$IPV6_REGEX" "$DATFILE" && __DNS_HAS_AAAA=1
->>>>>>> Stashed changes
 		fi
 
 		# If host doesn't support IPv6, we'll use IPv4 instead
@@ -738,21 +722,17 @@ do_transfer() {
 			write_log 7 "Force communication via IP '$__BINDIP'"
 			__PROG="$__PROG --bind-address=$__BINDIP"
 		fi
-		# force ip version to use
-<<<<<<< Updated upstream
-		if [ $force_ipversion -eq 1 ]; then
-				if [ $use_ipv6 -eq 0 ]; then
-=======
+		# forced IP version
 		if [ "$force_ipversion" -eq 1 ]; then
-				if [ "$use_ipv6" -eq 0 ]; then
->>>>>>> Stashed changes
-					__PROG="$__PROG -4"
-				elif [ $__DNS_HAS_AAAA -eq 1 ]; then
-					__PROG="$__PROG -6"	# only force IPv6 if host supports it
-				else
-					__PROG="$__PROG -4"	# fallback to IPv4 if host doesn't support IPv6
-				fi
-		elif [ $use_ipv6 -eq 1 ] && [ $__DNS_HAS_AAAA -eq 1 ]; then
+			if [ "$use_ipv6" -eq 0 ]; then
+				__PROG="$__PROG -4"
+			elif [ $__DNS_HAS_AAAA -eq 1 ]; then
+				__PROG="$__PROG -6"	# only force IPv6 if host supports it
+			else
+				__PROG="$__PROG -4"	# fallback to IPv4 if host doesn't support IPv6
+			fi
+		# unforced IP version	
+		elif [ "$use_ipv6" -eq 1 ] && [ $__DNS_HAS_AAAA -eq 1 ]; then
 			__PROG="$__PROG -6"	# use IPv6 if available
 		fi
 		# set certificate parameters
@@ -795,25 +775,17 @@ do_transfer() {
 			write_log 7 "Force communication via device '$__DEVICE'"
 			__PROG="$__PROG --interface $__DEVICE"
 		fi
-		# force ip version to use
-<<<<<<< Updated upstream
-		if [ $force_ipversion -eq 1 ]; then
-				if [ $use_ipv6 -eq 0 ]; then
-=======
+		# forced IP version
 		if [ "$force_ipversion" -eq 1 ]; then
-				if [ "$use_ipv6" -eq 0 ]; then
->>>>>>> Stashed changes
-					__PROG="$__PROG -4"
-				elif [ $__DNS_HAS_AAAA -eq 1 ]; then
-					__PROG="$__PROG -6"	# only force IPv6 if host supports it
-				else
-					__PROG="$__PROG -4"	# fallback to IPv4 if host doesn't support IPv6
-				fi
-<<<<<<< Updated upstream
-		elif [ $use_ipv6 -eq 1 ] && [ $__DNS_HAS_AAAA -eq 1 ]; then
-=======
+			if [ "$use_ipv6" -eq 0 ]; then
+				__PROG="$__PROG -4"
+			elif [ $__DNS_HAS_AAAA -eq 1 ]; then
+				__PROG="$__PROG -6"	# only force IPv6 if host supports it
+			else
+				__PROG="$__PROG -4"	# fallback to IPv4 if host doesn't support IPv6
+			fi
+		# unforced IP version	
 		elif [ "$use_ipv6" -eq 1 ] && [ $__DNS_HAS_AAAA -eq 1 ]; then
->>>>>>> Stashed changes
 			__PROG="$__PROG -6"	# use IPv6 if available
 		fi
 		# set certificate parameters
@@ -848,25 +820,17 @@ do_transfer() {
 		# force network/ip not supported
 		[ -n "$__BINDIP" ] && \
 			write_log 14 "uclient-fetch: FORCE binding to specific address not supported"
-		# force ip version to use
-<<<<<<< Updated upstream
-		if [ $force_ipversion -eq 1 ]; then
-				if [ $use_ipv6 -eq 0 ]; then
-=======
+		# forced IP version
 		if [ "$force_ipversion" -eq 1 ]; then
-				if [ "$use_ipv6" -eq 0 ]; then
->>>>>>> Stashed changes
-					__PROG="$__PROG -4"
-				elif [ $__DNS_HAS_AAAA -eq 1 ]; then
-					__PROG="$__PROG -6"	# only force IPv6 if host supports it
-				else
-					__PROG="$__PROG -4"	# fallback to IPv4 if host doesn't support IPv6
-				fi
-<<<<<<< Updated upstream
-		elif [ $use_ipv6 -eq 1 ] && [ $__DNS_HAS_AAAA -eq 1 ]; then
-=======
+			if [ "$use_ipv6" -eq 0 ]; then
+				__PROG="$__PROG -4"
+			elif [ $__DNS_HAS_AAAA -eq 1 ]; then
+				__PROG="$__PROG -6"	# only force IPv6 if host supports it
+			else
+				__PROG="$__PROG -4"	# fallback to IPv4 if host doesn't support IPv6
+			fi
+		# unforced IP version	
 		elif [ "$use_ipv6" -eq 1 ] && [ $__DNS_HAS_AAAA -eq 1 ]; then
->>>>>>> Stashed changes
 			__PROG="$__PROG -6"	# use IPv6 if available
 		fi
 		# https possibly not supported