tools: Add SSH_CMD array

Signed-off-by: Matt Turner <mattst88@gentoo.org>
2021-01-30 19:16:03 -05:00 · 2021-01-30 19:16:03 -05:00 · e357bcd867
parent 3d95cec60b
commit e357bcd867
14 changed files with 112 additions and 14 deletions
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@ -35,7 +35,14 @@ update_symlinks() {

 upload() {
 	echo Uploading "$@"
-	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local SSH_CMD=(
+		ssh
+		-i ${UPLOAD_KEY}
+		-o UserKnownHostsFile=/dev/null
+		-o VerifyHostKeyDNS=yes
+		-o StrictHostKeyChecking=no
+	)
+	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }

 post_build() {
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@ -67,8 +67,15 @@ update_symlinks() {

 upload() {
 	echo " ** Uploading $@"
+	local SSH_CMD=(
+		ssh
+		-i ${UPLOAD_KEY}
+		-o UserKnownHostsFile=/dev/null
+		-o VerifyHostKeyDNS=yes
+		-o StrictHostKeyChecking=no
+	)
 	rsync \
-	-e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
+	-e "${SSH_CMD[*]}" \
 	-a \
 	--omit-dir-times \
 	--delay-updates \
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@ -57,7 +57,14 @@ update_symlinks() {
 upload() {
    if [[ ${nonetwork} == 0 ]]; then
 	echo Uploading "$@"
-	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local SSH_CMD=(
+		ssh
+		-i ${UPLOAD_KEY}
+		-o UserKnownHostsFile=/dev/null
+		-o VerifyHostKeyDNS=yes
+		-o StrictHostKeyChecking=no
+	)
+	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
    else
 	echo Would now upload "$@"
 	ls -l $@
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@ -29,7 +29,14 @@ update_symlinks() {
 }

 upload() {
-	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local SSH_CMD=(
+		ssh
+		-i ${UPLOAD_KEY}
+		-o UserKnownHostsFile=/dev/null
+		-o VerifyHostKeyDNS=yes
+		-o StrictHostKeyChecking=no
+	)
+	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }

 post_build() {
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@ -35,7 +35,14 @@ update_symlinks() {
 }

 upload() {
-	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local SSH_CMD=(
+		ssh
+		-i ${UPLOAD_KEY}
+		-o UserKnownHostsFile=/dev/null
+		-o VerifyHostKeyDNS=yes
+		-o StrictHostKeyChecking=no
+	)
+	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }

 post_build() {
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@ -28,7 +28,14 @@ update_symlinks() {
 }

 upload() {
-	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local SSH_CMD=(
+		ssh
+		-i ${UPLOAD_KEY}
+		-o UserKnownHostsFile=/dev/null
+		-o VerifyHostKeyDNS=yes
+		-o StrictHostKeyChecking=no
+	)
+	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }

 post_build() {
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@ -34,7 +34,14 @@ update_symlinks() {
 }

 upload() {
-	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local SSH_CMD=(
+		ssh
+		-i ${UPLOAD_KEY}
+		-o UserKnownHostsFile=/dev/null
+		-o VerifyHostKeyDNS=yes
+		-o StrictHostKeyChecking=no
+	)
+	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@ -35,7 +35,14 @@ update_symlinks() {
 }

 upload() {
-	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local SSH_CMD=(
+		ssh
+		-i ${UPLOAD_KEY}
+		-o UserKnownHostsFile=/dev/null
+		-o VerifyHostKeyDNS=yes
+		-o StrictHostKeyChecking=no
+	)
+	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }

 post_build() {
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@ -58,7 +58,14 @@ update_symlinks() {
 upload() {
    if [[ ${nonetwork} == 0 ]]; then
 	echo Uploading "$@"
-	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local SSH_CMD=(
+		ssh
+		-i ${UPLOAD_KEY}
+		-o UserKnownHostsFile=/dev/null
+		-o VerifyHostKeyDNS=yes
+		-o StrictHostKeyChecking=no
+	)
+	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
    else
 	echo Would now upload "$@"
 	ls -l $@
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@ -45,7 +45,14 @@ update_symlinks() {
 upload() {
    if [[ ${nonetwork} == 0 ]]; then
 	echo Uploading "$@"
-	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local SSH_CMD=(
+		ssh
+		-i ${UPLOAD_KEY}
+		-o UserKnownHostsFile=/dev/null
+		-o VerifyHostKeyDNS=yes
+		-o StrictHostKeyChecking=no
+	)
+	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
    fi
 }

--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@ -28,7 +28,14 @@ update_symlinks() {
 }

 upload() {
-	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local SSH_CMD=(
+		ssh
+		-i ${UPLOAD_KEY}
+		-o UserKnownHostsFile=/dev/null
+		-o VerifyHostKeyDNS=yes
+		-o StrictHostKeyChecking=no
+	)
+	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }

 post_build() {
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@ -28,7 +28,14 @@ update_symlinks() {
 }

 upload() {
-	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local SSH_CMD=(
+		ssh
+		-i ${UPLOAD_KEY}
+		-o UserKnownHostsFile=/dev/null
+		-o VerifyHostKeyDNS=yes
+		-o StrictHostKeyChecking=no
+	)
+	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }

 post_build() {
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@ -30,7 +30,14 @@ update_symlinks() {
 }

 upload() {
-	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	local SSH_CMD=(
+		ssh
+		-i ${UPLOAD_KEY}
+		-o UserKnownHostsFile=/dev/null
+		-o VerifyHostKeyDNS=yes
+		-o StrictHostKeyChecking=no
+	)
+	rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }

 post_build() {
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@ -54,8 +54,15 @@ update_symlinks() {

 upload() {
 	echo " ** Uploading $@"
+	local SSH_CMD=(
+		ssh
+		-i ${UPLOAD_KEY}
+		-o UserKnownHostsFile=/dev/null
+		-o VerifyHostKeyDNS=yes
+		-o StrictHostKeyChecking=no
+	)
 	rsync \
-	-e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
+	-e "${SSH_CMD[*]}" \
 	-a \
 	--omit-dir-times \
 	--delay-updates \