tools: Add SSH_CMD array

Signed-off-by: Matt Turner <mattst88@gentoo.org>
This commit is contained in:
Matt Turner 2021-01-30 19:16:03 -05:00
parent 3d95cec60b
commit e357bcd867
14 changed files with 112 additions and 14 deletions

View file

@ -35,7 +35,14 @@ update_symlinks() {
upload() { upload() {
echo Uploading "$@" 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() { post_build() {

View file

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

View file

@ -57,7 +57,14 @@ update_symlinks() {
upload() { upload() {
if [[ ${nonetwork} == 0 ]]; then if [[ ${nonetwork} == 0 ]]; then
echo Uploading "$@" 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 else
echo Would now upload "$@" echo Would now upload "$@"
ls -l $@ ls -l $@

View file

@ -29,7 +29,14 @@ update_symlinks() {
} }
upload() { 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() { post_build() {

View file

@ -35,7 +35,14 @@ update_symlinks() {
} }
upload() { 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() { post_build() {

View file

@ -28,7 +28,14 @@ update_symlinks() {
} }
upload() { 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() { post_build() {

View file

@ -34,7 +34,14 @@ update_symlinks() {
} }
upload() { 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() { post_build() {

View file

@ -35,7 +35,14 @@ update_symlinks() {
} }
upload() { 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() { post_build() {

View file

@ -58,7 +58,14 @@ update_symlinks() {
upload() { upload() {
if [[ ${nonetwork} == 0 ]]; then if [[ ${nonetwork} == 0 ]]; then
echo Uploading "$@" 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 else
echo Would now upload "$@" echo Would now upload "$@"
ls -l $@ ls -l $@

View file

@ -45,7 +45,14 @@ update_symlinks() {
upload() { upload() {
if [[ ${nonetwork} == 0 ]]; then if [[ ${nonetwork} == 0 ]]; then
echo Uploading "$@" 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 fi
} }

View file

@ -28,7 +28,14 @@ update_symlinks() {
} }
upload() { 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() { post_build() {

View file

@ -28,7 +28,14 @@ update_symlinks() {
} }
upload() { 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() { post_build() {

View file

@ -30,7 +30,14 @@ update_symlinks() {
} }
upload() { 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() { post_build() {

View file

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