tools: Add RSYNC_OPTS array

Signed-off-by: Matt Turner <mattst88@gentoo.org>

tools/catalyst-auto-alpha.conf

@@ -42,7 +42,10 @@ upload() {
 		-o VerifyHostKeyDNS=yes
 		-o StrictHostKeyChecking=no
 	)
-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local RSYNC_OPTS=(
+		-e "${SSH_CMD[*]}"
+	)
+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

tools/catalyst-auto-amd64.conf

@@ -74,13 +74,13 @@ upload() {
 		-o VerifyHostKeyDNS=yes
 		-o StrictHostKeyChecking=no
 	)
-	rsync \
+	local RSYNC_OPTS=(
-	-e "${SSH_CMD[*]}" \
+		-e "${SSH_CMD[*]}"
-	-a \
+		--archive
-	--omit-dir-times \
+		--omit-dir-times
-	--delay-updates \
+		--delay-updates
-	"$@" \
+	)
-	"${UPLOAD_DEST}"
+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST}
 }
 
 post_build() {

tools/catalyst-auto-arm.conf

@@ -64,7 +64,10 @@ upload() {
 		-o VerifyHostKeyDNS=yes
 		-o StrictHostKeyChecking=no
 	)
-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local RSYNC_OPTS=(
+		-e "${SSH_CMD[*]}"
+	)
+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
     else
 	echo Would now upload "$@"
 	ls -l $@

tools/catalyst-auto-arm64.conf

@@ -36,7 +36,10 @@ upload() {
 		-o VerifyHostKeyDNS=yes
 		-o StrictHostKeyChecking=no
 	)
-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local RSYNC_OPTS=(
+		-e "${SSH_CMD[*]}"
+	)
+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

tools/catalyst-auto-hppa.conf

@@ -42,7 +42,10 @@ upload() {
 		-o VerifyHostKeyDNS=yes
 		-o StrictHostKeyChecking=no
 	)
-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local RSYNC_OPTS=(
+		-e "${SSH_CMD[*]}"
+	)
+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

tools/catalyst-auto-ia64.conf

@@ -35,7 +35,10 @@ upload() {
 		-o VerifyHostKeyDNS=yes
 		-o StrictHostKeyChecking=no
 	)
-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local RSYNC_OPTS=(
+		-e "${SSH_CMD[*]}"
+	)
+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

tools/catalyst-auto-ppc.conf

@@ -41,7 +41,10 @@ upload() {
 		-o VerifyHostKeyDNS=yes
 		-o StrictHostKeyChecking=no
 	)
-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local RSYNC_OPTS=(
+		-e "${SSH_CMD[*]}"
+	)
+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
  
 post_build() {

tools/catalyst-auto-ppc64le.conf

@@ -42,7 +42,10 @@ upload() {
 		-o VerifyHostKeyDNS=yes
 		-o StrictHostKeyChecking=no
 	)
-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local RSYNC_OPTS=(
+		-e "${SSH_CMD[*]}"
+	)
+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

tools/catalyst-auto-qemu-arm.conf

@@ -65,7 +65,10 @@ upload() {
 		-o VerifyHostKeyDNS=yes
 		-o StrictHostKeyChecking=no
 	)
-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local RSYNC_OPTS=(
+		-e "${SSH_CMD[*]}"
+	)
+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
     else
 	echo Would now upload "$@"
 	ls -l $@

tools/catalyst-auto-qemu-riscv.conf

@@ -52,7 +52,10 @@ upload() {
 		-o VerifyHostKeyDNS=yes
 		-o StrictHostKeyChecking=no
 	)
-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local RSYNC_OPTS=(
+		-e "${SSH_CMD[*]}"
+	)
+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
     fi
 }
 

tools/catalyst-auto-s390.conf

@@ -35,7 +35,10 @@ upload() {
 		-o VerifyHostKeyDNS=yes
 		-o StrictHostKeyChecking=no
 	)
-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local RSYNC_OPTS=(
+		-e "${SSH_CMD[*]}"
+	)
+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

tools/catalyst-auto-s390x.conf

@@ -35,7 +35,10 @@ upload() {
 		-o VerifyHostKeyDNS=yes
 		-o StrictHostKeyChecking=no
 	)
-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local RSYNC_OPTS=(
+		-e "${SSH_CMD[*]}"
+	)
+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

tools/catalyst-auto-sparc64.conf

@@ -37,7 +37,10 @@ upload() {
 		-o VerifyHostKeyDNS=yes
 		-o StrictHostKeyChecking=no
 	)
-	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local RSYNC_OPTS=(
+		-e "${SSH_CMD[*]}"
+	)
+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

tools/catalyst-auto-x86.conf

@@ -61,13 +61,13 @@ upload() {
 		-o VerifyHostKeyDNS=yes
 		-o StrictHostKeyChecking=no
 	)
-	rsync \
+	local RSYNC_OPTS=(
-	-e "${SSH_CMD[*]}" \
+		-e "${SSH_CMD[*]}"
-	-a \
+		--archive
-	--omit-dir-times \
+		--omit-dir-times
-	--delay-updates \
+		--delay-updates
-	"$@" \
+	)
-	"${UPLOAD_DEST}"
+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST}
 }
 
 post_build() {