Embrace bash3+ functionality and opt out sed and grep

Author: ShamrockLee

git-labview-integration-posix/common_header.sh

@@ -1,16 +1,16 @@
-set -eu
+set -eu -o pipefail
 
 function absolutize_posix_path {
 	local ORIG="$1"
 	local PWD_GIVEN=""
-	if test "$#" -ge 2; then
+	if (( "$#" > 2 )); then
 		PWD_GIVEN="$2"
 	else
 		PWD_GIVEN="$PWD"
 	fi
-	if test -n "$(echo "$ORIG" | grep -e '^["'"'"']*/+')"; then
+	if [[ "${ORIG:0:1}" == "/" ]]; then
 		echo "$ORIG"
-	elif test -n "$(echo "$ORIG" | grep -e '^\s*["'"'"']*\.["'"'"']*\s*$')"; then
+	elif [[ "$ORIG" == "." ]]; then
 		echo "$PWD_GIVEN"
 	else
 		echo "$PWD_GIVEN/$ORIG"

git-labview-integration-posix/config_process_header.sh

@@ -3,18 +3,18 @@
 
 PROJECT_ROOT_FORCED=""
 
-if test -f "$CONFIGURATION_PATH_GIVEN" || test -l "$CONFIGURATION_PATH_GIVEN"; then
+if [[ -f "$CONFIGURATION_PATH_GIVEN" ]] || [[ -L "$CONFIGURATION_PATH_GIVEN" ]]; then
 	source "$CONFIGURATION_PATH_GIVEN"
 else
-	echo "Configuration file ($CONFIGURATION_PATH_GIVEN) not found"
+	echo "Configuration file ($CONFIGURATION_PATH_GIVEN) not found" >&2
 	exit 1
 fi
 
 PROJECT_ROOT_POSIX=""
-if test -z "$PROJECT_ROOT_FORCED"; then
+if [[ -z "$PROJECT_ROOT_FORCED" ]]; then
 	PROJECT_ROOT_POSIX="$(
 		cd "$(dirname "$CONFIGURATION_SOURCE")"
-		if test "${CONFIGURATION_DIRECTORY_LEVEL:-0}" -gt 0; then
+		if (( CONFIGURATION_DIRECTORY_LEVEL )); then
 			for i in {1.."$CONFIGURATION_DIRECTORY_LEVEL"}; do
 				cd ..
 			done

git-labview-integration-windows/common_header.sh

@@ -1,30 +1,64 @@
-set -eu
+set -eu -o pipefail
 
 function windowsize_posix_path {
-        echo $1 | sed -r 's/^(["'"'"']*)\/([A-Za-z])/\1\U\2:/' | sed 's/\//\\/g'
+		if [[ "$1" =~ ^/[A-Za-z](/.*)?$ ]]; then
+			local diskRegister
+			diskRegister="$(echo "${1:1:1}" | tr '[:lower:]' '[:upper:]')"
+			local tailPath
+			# shellcheck disable=SC1003
+			tailPath="$(echo "${1:2}" | tr '/' '\\')"
+			if [[ -n "$tailPath" ]]; then
+				if [[ "${tailPath:${#tailPath}-1:1}" == "\\" ]]; then
+					tailPath="${tailPath:0:${#tailPath}-1}"
+				fi
+			else
+				tailPath="\\"
+			fi
+			echo "${diskRegister}:${tailPath}"
+		fi
 }
 
 function posixize_windows_path {
-        echo $1 | sed -r 's/^(["'"'"']*)([A-Za-z]):/\1\/\L\2/' | sed 's/\\/\//g'
+		if [[ "$1" =~ ^[A-Za-z]\: ]]; then
+			local diskRegister
+			diskRegister="$(echo "${1:0:1}" | tr '[:upper:]' '[:lower:]')"
+			local tailPath
+			# shellcheck disable=SC1003
+			tailPath="$(echo "${1:2}" | tr '\\' '/')"
+			if [[ -n "$tailPath" && "${tailPath:${#tailPath}-1:1}" == "/" ]]; then
+				tailPath="${tailPath:0:${#tailPath}-1}"
+			fi
+			echo "/${diskRegister}${tailPath}"
+		fi
 }
 
 function absolutize_windows_path {
 	local ORIG="$1"
 	local PWD_GIVEN=""
-	if test "$#" -ge 2; then
+	if (( "$#" > 2 )); then
 		PWD_GIVEN="$2"
 	else
 		PWD_GIVEN="$PWD"
 	fi
-	if test -n "$(echo "$ORIG" | grep -e '^["'"'"']*[A-Za-z]:')"; then
-		echo "$ORIG"
-	else
-		echo "$PWD_GIVEN\\$ORIG"
+	local MODIFIED="$ORIG"
+	if [[ "$ORIG" =~ ^[A-Za-z]\:\\+$ ]]; then
+		if (( "${#ORIG}" == 2 )); then
+			MODIFIED="${MODIFIED}\\"
+		fi
+		echo "$MODIFIED"
+		return 0
+	fi
+	if [[ ! "$ORIG" =~ ^[A-Za-z]\:\\ ]]; then
+		MODIFIED="$PWD_GIVEN\\$MODIFIED"
+	fi
+	if [[ "${MODIFIED:${#MODIFIED}-1:1}" == "\\" ]]; then
+		MODIFIED="${MODIFIED:0:${#MODIFIED}-1}"
 	fi
+	echo "$MODIFIED"
 }
 
 function fix_tool_input_path {
 	local PATH_TO_FIX="$1"
-	local PROJECT_ROOT_WINDOWS="${2}"
+	local PROJECT_ROOT_WINDOWS="$2"
 	absolutize_windows_path "$(windowsize_posix_path "$PATH_TO_FIX")" "$PROJECT_ROOT_WINDOWS"
 }

git-labview-integration-windows/config_process_header.sh

@@ -3,22 +3,22 @@
 
 PROJECT_ROOT_FORCED=""
 
-if test -f "$CONFIGURATION_PATH_GIVEN" || test -l "$CONFIGURATION_PATH_GIVEN"; then
+if [[ -f "$CONFIGURATION_PATH_GIVEN" ]] || [[ -L "$CONFIGURATION_PATH_GIVEN" ]]; then
 	source "$CONFIGURATION_PATH_GIVEN"
 else
-	echo "Configuration file ($CONFIGURATION_PATH_GIVEN) not found"
+	echo "Configuration file ($CONFIGURATION_PATH_GIVEN) not found" >&2
 	exit 1
 fi
 
-if test -z "$PROJECT_ROOT_FORCED"; then
+if [[ -z "$PROJECT_ROOT_FORCED" ]]; then
 	PROJECT_ROOT_POSIX="$(
-	cd "$(dirname "$CONFIGURATION_SOURCE")"
-	if test "${CONFIGURATION_DIRECTORY_LEVEL:-0}" -gt 0; then
-		for i in {1.."$CONFIGURATION_DIRECTORY_LEVEL"}; do
-			cd ..
-		done
-	fi
-	pwd
+		cd "$(dirname "$CONFIGURATION_SOURCE")"
+		if (( CONFIGURATION_DIRECTORY_LEVEL )); then
+			for i in {1.."$CONFIGURATION_DIRECTORY_LEVEL"}; do
+				cd ..
+			done
+		fi
+		pwd
 	)"
 	PROJECT_ROOT_WINDOWS="$(windowsize_posix_path "$PROJECT_ROOT_POSIX")"
 else