#9: Updates scmi defaults for readability/consisitency.

Author: jdeathe

src/opt/scmi/default.sh

@@ -1,15 +1,39 @@
 
 # Handle incrementing the docker host port for instances unless a port range is defined.
 DOCKER_PUBLISH=
-if [[ ${DOCKER_PORT_MAP_TCP_6379} != NULL ]]; then
-	if grep -qE '^([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}:)?[0-9]*$' <<< "${DOCKER_PORT_MAP_TCP_6379}" \
-		&& grep -qE '^.+\.([0-9]+)\.([0-9]+)$' <<< "${DOCKER_NAME}"; then
+if [[ ${DOCKER_PORT_MAP_TCP_6379} != NULL ]]
+then
+	if grep -qE \
+			'^([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}:)?[1-9][0-9]*$' \
+			<<< "${DOCKER_PORT_MAP_TCP_6379}" \
+		&& grep -qE \
+			'^.+\.[0-9]+(\.[0-9]+)?$' \
+			<<< "${DOCKER_NAME}"
+	then
 		printf -v \
 			DOCKER_PUBLISH \
 			-- '%s --publish %s%s:6379/tcp' \
 			"${DOCKER_PUBLISH}" \
-			"$(grep -o '^[0-9\.]*:' <<< "${DOCKER_PORT_MAP_TCP_6379}")" \
-			"$(( $(grep -o '[0-9]*$' <<< "${DOCKER_PORT_MAP_TCP_6379}") + $(sed 's~\.[0-9]*$~~' <<< "${DOCKER_NAME}" | awk -F. '{ print $NF; }') - 1 ))"
+			"$(
+				grep -o \
+					'^[0-9\.]*:' \
+					<<< "${DOCKER_PORT_MAP_TCP_6379}"
+			)" \
+			"$(( 
+				$(
+					grep -oE \
+						'[0-9]+$' \
+						<<< "${DOCKER_PORT_MAP_TCP_6379}"
+				) \
+				+ $(
+					grep -oE \
+						'([0-9]+)(\.[0-9]+)?$' \
+						<<< "${DOCKER_NAME}" \
+					| awk -F. \
+						'{ print $1; }'
+				) \
+				- 1
+			))"
 	else
 		printf -v \
 			DOCKER_PUBLISH \
@@ -19,15 +43,39 @@ if [[ ${DOCKER_PORT_MAP_TCP_6379} != NULL ]]; then
 	fi
 fi
 
-if [[ ${DOCKER_PORT_MAP_UDP_6379} != NULL ]]; then
-	if grep -qE '^([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}:)?[0-9]*$' <<< "${DOCKER_PORT_MAP_UDP_6379}" \
-		&& grep -qE '^.+\.([0-9]+)\.([0-9]+)$' <<< "${DOCKER_NAME}"; then
+if [[ ${DOCKER_PORT_MAP_UDP_6379} != NULL ]]
+then
+	if grep -qE \
+			'^([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}:)?[1-9][0-9]*$' \
+			<<< "${DOCKER_PORT_MAP_UDP_6379}" \
+		&& grep -qE \
+			'^.+\.[0-9]+(\.[0-9]+)?$' \
+			<<< "${DOCKER_NAME}"
+	then
 		printf -v \
 			DOCKER_PUBLISH \
 			-- '%s --publish %s%s:6379/udp' \
 			"${DOCKER_PUBLISH}" \
-			"$(grep -o '^[0-9\.]*:' <<< "${DOCKER_PORT_MAP_UDP_6379}")" \
-			"$(( $(grep -o '[0-9]*$' <<< "${DOCKER_PORT_MAP_UDP_6379}") + $(sed 's~\.[0-9]*$~~' <<< "${DOCKER_NAME}" | awk -F. '{ print $NF; }') - 1 ))"
+			"$(
+				grep -o \
+					'^[0-9\.]*:' \
+					<<< "${DOCKER_PORT_MAP_UDP_6379}"
+			)" \
+			"$(( 
+				$(
+					grep -oE \
+						'[0-9]+$' \
+						<<< "${DOCKER_PORT_MAP_UDP_6379}"
+				) \
+				+ $(
+					grep -oE \
+						'([0-9]+)(\.[0-9]+)?$' \
+						<<< "${DOCKER_NAME}" \
+					| awk -F. \
+						'{ print $1; }'
+				) \
+				- 1
+			))"
 	else
 		printf -v \
 			DOCKER_PUBLISH \