re "s|echo \"\\\$|printf '%s\\\n' \"\$|g"

Replace all cases where `echo` was given a variable as its first
argument, even on cases where we always know what the variable's content
look like.

1 files changed, 5 insertions, 5 deletions

diff --git a/bin/vm b/bin/vm
index b123ee5..1b7c878 100755
--- a/bin/vm
+++ b/bin/vm
@@ -163,7 +163,7 @@ mkdir -p "$RUNDIR" "$QCOW_DIR" "$XDG_DATA_HOME"/vm "$(dirname "$LOGS")"
 guess_name() {
 	PREFIX="$1"
 	IMAGES="$(find "$QCOW_DIR" '(' -type f -or -type l ')' -name "${PREFIX}*")"
-	COUNT="$(echo "$IMAGES" | wc -l)"
+	COUNT="$(printf '%s\n' "$IMAGES" | wc -l)"
 	if [ "$COUNT" != 1 ]; then
 		printf 'Cannot guess name with the given prefix: "%s".\n' "$PREFIX" >&2
 		printf '\nThe possibilities are:\n' >&2
@@ -181,7 +181,7 @@ guess_name() {
 }
 
 guess_arch() {
-	NAME="$(echo "$1" | cut -d- -f2)"
+	NAME="$(printf '%s\n' "$1" | cut -d- -f2)"
 	case "$NAME" in
 		amd64)
 			printf 'x86_64'
@@ -194,8 +194,8 @@ guess_arch() {
 
 hostfwd() {
 	for m in "$@"; do
-		HOST="$( echo "$m" | cut -d: -f1)"
-		GUEST="$(echo "$m" | cut -d: -f2)"
+		HOST="$( printf '%s\n' "$m" | cut -d: -f1)"
+		GUEST="$(printf '%s\n' "$m" | cut -d: -f2)"
 		printf ',hostfwd=tcp::%s-:%s' "$HOST" "$GUEST"
 	done
 }
@@ -304,7 +304,7 @@ case "$ACTION" in
 			$FLAGS "$@"
 
 		if [ "$DRY_RUN" = true ]; then
-			echo "$@"
+			printf '%s\n' "$@"
 			exit
 		fi