From 0c56cf81671ee3f2ae387d9877f91eff8a9cfd48 Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@terrastruct.com>
Date: Mon, 14 Nov 2022 11:56:40 -0800
Subject: [PATCH] ci/release: Fixes

---
 ci/release/_install.sh            |  2 +-
 ci/release/build.sh               |  4 +++-
 ci/release/builders/aws_ensure.sh | 16 +++++++++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ci/release/_install.sh b/ci/release/_install.sh
index 4637489f0..7141fd22f 100755
--- a/ci/release/_install.sh
+++ b/ci/release/_install.sh
@@ -325,7 +325,7 @@ is_prefix_writable() {
   # /usr/local owned by root but you don't need root to write to its subdirectories which
   # is all we want to do.
   if [ ! -w "$PREFIX/bin" ]; then
-    return 0
+    return 1
   fi
 }
 
diff --git a/ci/release/build.sh b/ci/release/build.sh
index be40bd835..bde09257c 100755
--- a/ci/release/build.sh
+++ b/ci/release/build.sh
@@ -170,8 +170,9 @@ OS=$OS \
 ARCH=$ARCH \
 ARCHIVE=$ARCHIVE \
 TERM=$TERM \
-PATH=\"/usr/local/bin:/usr/local/sbin\${PATH+:\$PATH}\" \
+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"
 }
 
@@ -186,6 +187,7 @@ ARCH=$ARCH \
 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"
 }
 
diff --git a/ci/release/builders/aws_ensure.sh b/ci/release/builders/aws_ensure.sh
index d1b1a531c..dfeb3443c 100755
--- a/ci/release/builders/aws_ensure.sh
+++ b/ci/release/builders/aws_ensure.sh
@@ -5,7 +5,7 @@ cd -- "$(dirname "$0")/../../.."
 
 help() {
   cat <<EOF
-usage: $0 [--dry-run]
+usage: $0 [--dry-run] [--skip-create]
 
 $0 creates and ensures the d2 builders in AWS.
 EOF
@@ -23,6 +23,10 @@ main() {
         flag_noarg && shift "$FLAGSHIFT"
         DRY_RUN=1
         ;;
+      skip-create)
+        flag_noarg && shift "$FLAGSHIFT"
+        SKIP_CREATE=1
+        ;;
       '')
         shift "$FLAGSHIFT"
         break
@@ -36,7 +40,9 @@ main() {
     flag_errusage "no arguments are accepted"
   fi
 
-  create_rhosts
+  if [ -z "${SKIP_CREATE-}" ]; then
+    create_rhosts
+  fi
   init_rhosts
 }
 
@@ -228,9 +234,9 @@ init_rhost_macos() {
     sleep 5
   done
   sh_c ssh "$RHOST" '": | /bin/bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\""'
-  sh_c ssh "$RHOST" '/usr/local/bin/brew update'
-  sh_c ssh "$RHOST" '/usr/local/bin/brew upgrade'
-  sh_c ssh "$RHOST" '/usr/local/bin/brew install go'
+  sh_c ssh "$RHOST" 'PATH="/usr/local/bin:/opt/homebrew/bin:\$PATH" brew update'
+  sh_c ssh "$RHOST" 'PATH="/usr/local/bin:/opt/homebrew/bin:\$PATH" brew upgrade'
+  sh_c ssh "$RHOST" 'PATH="/usr/local/bin:/opt/homebrew/bin:\$PATH" brew install go'
 }
 
 main "$@"