From 6cc474f990a3c62804facb2a254217d9b69058d1 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Tue, 12 Mar 2019 22:02:58 -0400
Subject: lib/control.sh, lib/package.sh: Replace echo with here-document in tr commands

---
(limited to 'lib/package.sh')

diff --git a/lib/package.sh b/lib/package.sh
index 5111341..9c6f861 100644
--- a/lib/package.sh
+++ b/lib/package.sh
@@ -113,8 +113,10 @@ ob_parse_package_metadata()
 				>>"${cache_file}"
 		done
 		for pkg in $(ob_get_binary_packages); do
-			pkg_clean="$(echo "${pkg}" | tr 'a-z' 'A-Z' | \
-				tr -dC 'A-Z0-9')"
+			pkg_clean="$({ tr 'a-z' 'A-Z' | tr -dC 'A-Z0-9';} <<-EOF
+				"${pkg}"
+				EOF
+				)"
 			for param_name in ${_OB_BINARY_PARAMETERS}; do
 				param_value="$(ob_get_binary_parameter "${pkg}" \
 					"${param_name}" | sed "s/'/'\\\\''/g")"
@@ -176,9 +178,11 @@ ob_get_binary_packages()
 			fi
 
 			# Make sure the "clean" name is unique.
-			pkg_clean=" $(echo "${pkg}" | tr 'a-z' 'A-Z' | \
-				tr -dC 'A-Z0-9') "
-			if echo "${pkgs_clean}" | grep "${pkg_clean}" \
+			pkg_clean="$({ tr 'a-z' 'A-Z' | tr -dC 'A-Z0-9';} <<-EOF
+				"${pkg}"
+				EOF
+				)"
+			if echo "${pkgs_clean}" | grep " ${pkg_clean} " \
 					>/dev/null 2>&1; then
 			_ob_warn_msg 'duplicate_clean_binary_name' \
 				"${pkg_clean}"
@@ -230,7 +234,10 @@ ob_get_source_parameter()
 	case "${name}" in *[!A-Za-z0-9-]* | '')
 		return 125
 	esac
-	name="$(echo "${name}" | tr 'a-z-' 'A-Z_')"
+	name="$(tr 'a-z-' 'A-Z_' <<-EOF
+		${name}
+		EOF
+		)"
 
 	eval "printf '%s' \"\${_OB_SRCFIELD_${name}}\""
 
@@ -254,14 +261,19 @@ ob_get_binary_parameter()
 	fi
 
 	# Convert package name to its uppercase "clean" form.
-	package="$(echo "${package}" | tr 'a-z' 'A-Z' | \
-		tr -dC 'A-Z0-9')"
+	package="$({ tr 'a-z' 'A-Z' | tr -dC 'A-Z0-9'; } <<-EOF
+		"${pkg}"
+		EOF
+		)"
 
 	# Convert field name to uppercase and validate.
 	case "${name}" in *[!A-Za-z0-9-]* | '')
 		return 125
 	esac
-	name="$(echo "${name}" | tr 'a-z-' 'A-Z_')"
+	name="$(tr 'a-z-' 'A-Z_' <<-EOF
+		${name}
+		EOF
+		)"
 
 	eval "printf '%s' \"\${_OB_BINFIELD_${package}_${name}}\""
 
@@ -356,7 +368,10 @@ _ob_set_source_parameter()
 	case "${name}" in *[!A-Za-z0-9-]* | '')
 		return 125
 	esac
-	name="$(echo "${name}" | tr 'a-z-' 'A-Z_')"
+	name="$(tr 'a-z-' 'A-Z_' <<-EOF
+		${name}
+		EOF
+		)"
 
 	_OB_SOURCE_PARAMETERS="${_OB_SOURCE_PARAMETERS} ${name}"
 
@@ -380,14 +395,19 @@ _ob_set_binary_parameter()
 	fi
 
 	# Convert package name to its uppercase "clean" form.
-	package="$(echo "${package}" | tr 'a-z' 'A-Z' | \
-		tr -dC 'A-Z0-9')"
+	package="$({ tr 'a-z' 'A-Z' | tr -dC 'A-Z0-9'; } <<-EOF
+		"${pkg}"
+		EOF
+		)"
 
 	# Convert field name to uppercase and validate.
 	case "${name}" in *[!A-Za-z0-9-]* | '')
 		return 125
 	esac
-	name="$(echo "${name}" | tr 'a-z-' 'A-Z_')"
+	name="$(tr 'a-z-' 'A-Z_' <<-EOF
+		${name}
+		EOF
+		)"
 
 	if ! echo " ${_OB_BINARY_PARAMETERS} " | grep " ${name} " \
 			>/dev/null 2>&1; then
--
cgit v0.9.1