commit: 4de1432aa1494b7c2459bb7fa740234a6777eac5
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 00:39:55 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 01:56:43 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=4de1432a
tools: Add RSYNC_OPTS array
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-alpha.conf | 5 ++++-
tools/catalyst-auto-amd64.conf | 14 +++++++-------
tools/catalyst-auto-arm.conf | 5 ++++-
tools/catalyst-auto-arm64.conf | 5 ++++-
tools/catalyst-auto-hppa.conf | 5 ++++-
tools/catalyst-auto-ia64.conf | 5 ++++-
tools/catalyst-auto-ppc.conf | 5 ++++-
tools/catalyst-auto-ppc64le.conf | 5 ++++-
tools/catalyst-auto-qemu-arm.conf | 5 ++++-
tools/catalyst-auto-qemu-riscv.conf | 5 ++++-
tools/catalyst-auto-s390.conf | 5 ++++-
tools/catalyst-auto-s390x.conf | 5 ++++-
tools/catalyst-auto-sparc64.conf | 5 ++++-
tools/catalyst-auto-x86.conf | 14 +++++++-------
14 files changed, 62 insertions(+), 26 deletions(-)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index ebaff6eb..381171b5 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/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() {
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 0ef11f2f..363c80cb 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -74,13 +74,13 @@ upload() {
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
)
- rsync \
- -e "${SSH_CMD[*]}" \
- -a \
- --omit-dir-times \
- --delay-updates \
- "$@" \
- "${UPLOAD_DEST}"
+ local RSYNC_OPTS=(
+ -e "${SSH_CMD[*]}"
+ --archive
+ --omit-dir-times
+ --delay-updates
+ )
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST}
}
post_build() {
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 26fe8156..eaae0399 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/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 $@
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 9f457989..1bd94ae9 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/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() {
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 8b465421..3b93e4ec 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/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() {
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 6c78c8a7..2d87a837 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/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() {
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index a1286726..615c3f55 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/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() {
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 0d54fab9..e2394932 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/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() {
diff --git a/tools/catalyst-auto-qemu-arm.conf
b/tools/catalyst-auto-qemu-arm.conf
index 1a121997..e6075ec3 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/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 $@
diff --git a/tools/catalyst-auto-qemu-riscv.conf
b/tools/catalyst-auto-qemu-riscv.conf
index b19de76f..dced8eec 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/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
}
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 5716702c..d8a39286 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/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() {
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 3b4fd21c..e8a509d5 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/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() {
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index bc441b2d..9cfbdcd5 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/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() {
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index ef983969..1c809465 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -61,13 +61,13 @@ upload() {
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
)
- rsync \
- -e "${SSH_CMD[*]}" \
- -a \
- --omit-dir-times \
- --delay-updates \
- "$@" \
- "${UPLOAD_DEST}"
+ local RSYNC_OPTS=(
+ -e "${SSH_CMD[*]}"
+ --archive
+ --omit-dir-times
+ --delay-updates
+ )
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST}
}
post_build() {
