From 9032c977ef55d6e65d0de5a4bf5730028d483e53 Mon Sep 17 00:00:00 2001
From: Tyler Rick <tyler@tylerrick.com>
Date: Wed, 27 Sep 2023 15:26:33 -0700
Subject: [PATCH] Build up the rsync command positional args using `set --`
 instead of the error-prone way of building the command as a string.

This prevents the need to double quote extra args for rsync (#84).
---
 timemachine | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/timemachine b/timemachine
index 27c7c38..c446da8 100755
--- a/timemachine
+++ b/timemachine
@@ -427,10 +427,10 @@ if link_exists "${DEST}/${BACKUP_LATEST}"; then
 	BTYPE="incremental"
 
 	logmsg "Starting incremental backup"
-	logmsg "\$ rsync $* $( escape_path "${SRC}" ) $( escape_path "${DEST}/${BACKUP_INPROGRESS}" )"
+	logmsg "\$ rsync $* ${SRC} ${DEST}/${BACKUP_INPROGRESS}"
 
-	cmd="rsync \
-		-e \"ssh ${SSH_ARGS}\" \
+	set -- rsync \
+		-e "ssh ${SSH_ARGS}" \
 		--recursive \
 		--perms \
 		--owner \
@@ -441,16 +441,16 @@ if link_exists "${DEST}/${BACKUP_LATEST}"; then
 		--delete-excluded \
 		--partial-dir=${RSYNC_PARTIAL} \
 		--link-dest=../${BACKUP_LATEST} \
-		$* \
-		$( escape_path "${SRC}" ) $( escape_path "${DEST}/${BACKUP_INPROGRESS}" )"
+		"$@" \
+		"${SRC}" "${DEST}/${BACKUP_INPROGRESS}"
 else
 	BTYPE="full"
 
 	logmsg "Starting full backup"
-	logmsg "\$ rsync $* $( escape_path "${SRC}" ) $( escape_path "${DEST}/${BACKUP_INPROGRESS}" )"
+	logmsg "\$ rsync $* ${SRC} ${DEST}/${BACKUP_INPROGRESS}"
 
-	cmd="rsync \
-		-e \"ssh ${SSH_ARGS}\" \
+	set -- rsync \
+		-e "ssh ${SSH_ARGS}" \
 		--recursive \
 		--perms \
 		--owner \
@@ -460,11 +460,11 @@ else
 		--delete \
 		--delete-excluded \
 		--partial-dir=${RSYNC_PARTIAL} \
-		$* \
-		$( escape_path "${SRC}" ) $( escape_path "${DEST}/${BACKUP_INPROGRESS}" )"
+		"$@" \
+		"${SRC}" "${DEST}/${BACKUP_INPROGRESS}"
 fi
 
-if ! eval "${cmd}"; then
+if ! "$@"; then
 	logerr "${MY_NAME} Backup has failed"
 	exit 1
 fi