From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BB37613835C for ; Mon, 1 Feb 2021 04:04:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8B71E09C7; Mon, 1 Feb 2021 04:04:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 86FBAE09C7 for ; Mon, 1 Feb 2021 04:04:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 64AC0335D91 for ; Mon, 1 Feb 2021 04:04:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E2A314AE for ; Mon, 1 Feb 2021 04:04:47 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1612058187.e357bcd8673a5e86c152a0e584762a363715a0a8.mattst88@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto-alpha.conf tools/catalyst-auto-amd64.conf tools/catalyst-auto-arm.conf tools/catalyst-auto-arm64.conf tools/catalyst-auto-hppa.conf tools/catalyst-auto-ia64.conf tools/catalyst-auto-ppc.conf tools/catalyst-auto-ppc64le.conf tools/catalyst-auto-qemu-arm.conf tools/catalyst-auto-qemu-riscv.conf tools/catalyst-auto-s390.conf tools/catalyst-auto-s390x.conf tools/catalyst-auto-sparc64.conf tools/catalyst-auto-x86.conf X-VCS-Directories: tools/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: e357bcd8673a5e86c152a0e584762a363715a0a8 X-VCS-Branch: master Date: Mon, 1 Feb 2021 04:04:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8fb5ba8b-386d-414a-95c1-d22bf6f68d85 X-Archives-Hash: bbece76ed1c9f276fede60148cfd2bd1 commit: e357bcd8673a5e86c152a0e584762a363715a0a8 Author: Matt Turner gentoo org> AuthorDate: Sun Jan 31 00:16:03 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Jan 31 01:56:27 2021 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e357bcd8 tools: Add SSH_CMD array Signed-off-by: Matt Turner gentoo.org> tools/catalyst-auto-alpha.conf | 9 ++++++++- tools/catalyst-auto-amd64.conf | 9 ++++++++- tools/catalyst-auto-arm.conf | 9 ++++++++- tools/catalyst-auto-arm64.conf | 9 ++++++++- tools/catalyst-auto-hppa.conf | 9 ++++++++- tools/catalyst-auto-ia64.conf | 9 ++++++++- tools/catalyst-auto-ppc.conf | 9 ++++++++- tools/catalyst-auto-ppc64le.conf | 9 ++++++++- tools/catalyst-auto-qemu-arm.conf | 9 ++++++++- tools/catalyst-auto-qemu-riscv.conf | 9 ++++++++- tools/catalyst-auto-s390.conf | 9 ++++++++- tools/catalyst-auto-s390x.conf | 9 ++++++++- tools/catalyst-auto-sparc64.conf | 9 ++++++++- tools/catalyst-auto-x86.conf | 9 ++++++++- 14 files changed, 112 insertions(+), 14 deletions(-) diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf index a60f979d..ebaff6eb 100644 --- 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() { diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index 16aeda56..0ef11f2f 100644 --- 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 \ diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf index 56459c50..26fe8156 100644 --- 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 $@ diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf index 064e6f41..9f457989 100644 --- 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() { diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf index d2034010..8b465421 100644 --- 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() { diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf index 845ffc51..6c78c8a7 100644 --- 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() { diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf index 8628f30f..a1286726 100644 --- 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() { diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf index 716e43fd..0d54fab9 100644 --- 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() { diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf index c351e99b..1a121997 100644 --- 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 $@ diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf index 14e2b561..b19de76f 100644 --- 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 } diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf index 8f59d581..5716702c 100644 --- 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() { diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf index 241179d5..3b4fd21c 100644 --- 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() { diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf index fd963987..bc441b2d 100644 --- 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() { diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf index 4753c3fe..ef983969 100644 --- 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 \