From 4c731d7b2447f6b67205b46fbc22cf78e31737cd Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Wed, 16 Nov 2022 04:02:35 -0800 Subject: [PATCH] release/build.sh: RHOST -> REMOTE_HOST --- ci/release/build.sh | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ci/release/build.sh b/ci/release/build.sh index 9a5e6219d..242ebd6de 100755 --- a/ci/release/build.sh +++ b/ci/release/build.sh @@ -118,10 +118,10 @@ build() { macos) case $ARCH in amd64) - RHOST=$TSTRUCT_MACOS_AMD64_BUILDER build_rhost_macos + REMOTE_HOST=$TSTRUCT_MACOS_AMD64_BUILDER build_remote_macos ;; arm64) - RHOST=$TSTRUCT_MACOS_ARM64_BUILDER build_rhost_macos + REMOTE_HOST=$TSTRUCT_MACOS_ARM64_BUILDER build_remote_macos ;; *) warn "no builder for OS=$OS ARCH=$ARCH, building locally..." @@ -132,10 +132,10 @@ build() { linux) case $ARCH in amd64) - RHOST=$TSTRUCT_LINUX_AMD64_BUILDER build_rhost_linux + REMOTE_HOST=$TSTRUCT_LINUX_AMD64_BUILDER build_remote_linux ;; arm64) - RHOST=$TSTRUCT_LINUX_ARM64_BUILDER build_rhost_linux + REMOTE_HOST=$TSTRUCT_LINUX_ARM64_BUILDER build_remote_linux ;; *) warn "no builder for OS=$OS ARCH=$ARCH, building locally..." @@ -160,12 +160,12 @@ build_local() { sh_c ./ci/release/_build.sh } -build_rhost_macos() { - sh_c lockfile_ssh "$RHOST" .d2-build-lock +build_remote_macos() { + sh_c lockfile_ssh "$REMOTE_HOST" .d2-build-lock trap unlockfile_ssh EXIT - sh_c ssh "$RHOST" mkdir -p src - sh_c rsync --archive --human-readable --delete ./ "$RHOST:src/d2/" - sh_c ssh -tttt "$RHOST" "DRY_RUN=${DRY_RUN-} \ + sh_c ssh "$REMOTE_HOST" mkdir -p src + sh_c rsync --archive --human-readable --delete ./ "$REMOTE_HOST:src/d2/" + sh_c ssh -tttt "$REMOTE_HOST" "DRY_RUN=${DRY_RUN-} \ HW_BUILD_DIR=$HW_BUILD_DIR \ VERSION=$VERSION \ OS=$OS \ @@ -175,15 +175,15 @@ TERM=$TERM \ PATH=\\\"/usr/local/bin:/usr/local/sbin:/opt/homebrew/bin:/opt/homebrew/sbin\\\${PATH+:\\\$PATH}\\\" \ ./src/d2/ci/release/_build.sh" sh_c mkdir -p "$HW_BUILD_DIR" - sh_c rsync --archive --human-readable "$RHOST:src/d2/$ARCHIVE" "$ARCHIVE" + sh_c rsync --archive --human-readable "$REMOTE_HOST:src/d2/$ARCHIVE" "$ARCHIVE" } -build_rhost_linux() { - sh_c lockfile_ssh "$RHOST" .d2-build-lock +build_remote_linux() { + sh_c lockfile_ssh "$REMOTE_HOST" .d2-build-lock trap unlockfile_ssh EXIT - sh_c ssh "$RHOST" mkdir -p src - sh_c rsync --archive --human-readable --delete ./ "$RHOST:src/d2/" - sh_c ssh -tttt "$RHOST" "DRY_RUN=${DRY_RUN-} \ + sh_c ssh "$REMOTE_HOST" mkdir -p src + sh_c rsync --archive --human-readable --delete ./ "$REMOTE_HOST:src/d2/" + sh_c ssh -tttt "$REMOTE_HOST" "DRY_RUN=${DRY_RUN-} \ HW_BUILD_DIR=$HW_BUILD_DIR \ VERSION=$VERSION \ OS=$OS \ @@ -192,7 +192,7 @@ ARCHIVE=$ARCHIVE \ TERM=$TERM \ ./src/d2/ci/release/build_docker.sh" sh_c mkdir -p "$HW_BUILD_DIR" - sh_c rsync --archive --human-readable "$RHOST:src/d2/$ARCHIVE" "$ARCHIVE" + sh_c rsync --archive --human-readable "$REMOTE_HOST:src/d2/$ARCHIVE" "$ARCHIVE" } ssh() {