From 89e0e0cf6a35065ab85520c5015786d0f5d1fa39 Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@terrastruct.com>
Date: Wed, 7 Dec 2022 17:15:51 -0800
Subject: [PATCH 1/3] install.sh: Run brew update before install

Ensure formulas are up to date.
---
 ci/release/_install.sh | 6 +-----
 install.sh             | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/ci/release/_install.sh b/ci/release/_install.sh
index 6428f432b..fc3d716f6 100755
--- a/ci/release/_install.sh
+++ b/ci/release/_install.sh
@@ -348,6 +348,7 @@ install_d2_standalone() {
 install_d2_brew() {
   header "installing d2 with homebrew"
   sh_c brew tap terrastruct/d2
+  sh_c brew update
   sh_c brew install d2
 }
 
@@ -502,11 +503,6 @@ fetch_gh() {
   sh_c mv "$file.inprogress" "$file"
 }
 
-brew() {
-  # Makes brew sane.
-  HOMEBREW_NO_INSTALL_CLEANUP=1 HOMEBREW_NO_AUTO_UPDATE=1 command brew "$@"
-}
-
 # The main function does more than provide organization. It provides robustness in that if
 # the install script was to only partial download into sh, sh will not execute it because
 # main is not invoked until the very last byte.
diff --git a/install.sh b/install.sh
index 07425ca70..103ae05cd 100755
--- a/install.sh
+++ b/install.sh
@@ -931,6 +931,7 @@ install_d2_standalone() {
 install_d2_brew() {
   header "installing d2 with homebrew"
   sh_c brew tap terrastruct/d2
+  sh_c brew update
   sh_c brew install d2
 }
 
@@ -1085,11 +1086,6 @@ fetch_gh() {
   sh_c mv "$file.inprogress" "$file"
 }
 
-brew() {
-  # Makes brew sane.
-  HOMEBREW_NO_INSTALL_CLEANUP=1 HOMEBREW_NO_AUTO_UPDATE=1 command brew "$@"
-}
-
 # The main function does more than provide organization. It provides robustness in that if
 # the install script was to only partial download into sh, sh will not execute it because
 # main is not invoked until the very last byte.

From 17f45d15922cee03e67b3bb3a73d602208f6699e Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@terrastruct.com>
Date: Wed, 7 Dec 2022 17:35:10 -0800
Subject: [PATCH 2/3] install.sh: Update for tap rename

---
 ci/release/_install.sh | 5 ++---
 docs/INSTALL.md        | 1 -
 install.sh             | 5 ++---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ci/release/_install.sh b/ci/release/_install.sh
index fc3d716f6..f0c653312 100755
--- a/ci/release/_install.sh
+++ b/ci/release/_install.sh
@@ -347,7 +347,6 @@ install_d2_standalone() {
 
 install_d2_brew() {
   header "installing d2 with homebrew"
-  sh_c brew tap terrastruct/d2
   sh_c brew update
   sh_c brew install d2
 }
@@ -391,8 +390,8 @@ install_tala_standalone() {
 
 install_tala_brew() {
   header "installing tala with homebrew"
-  sh_c brew tap terrastruct/d2
-  sh_c brew install tala
+  sh_c brew update
+  sh_c brew install terrastruct/tap/tala
 }
 
 uninstall() {
diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index 7d29525d2..f5ee0cd86 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -71,7 +71,6 @@ but that is coming soon. [#315](https://github.com/terrastruct/d2/issues/315)
 If you're on macOS, you can install with `brew`.
 
 ```sh
-brew tap terrastruct/d2
 brew install d2
 ```
 
diff --git a/install.sh b/install.sh
index 103ae05cd..37f4fbcbb 100755
--- a/install.sh
+++ b/install.sh
@@ -930,7 +930,6 @@ install_d2_standalone() {
 
 install_d2_brew() {
   header "installing d2 with homebrew"
-  sh_c brew tap terrastruct/d2
   sh_c brew update
   sh_c brew install d2
 }
@@ -974,8 +973,8 @@ install_tala_standalone() {
 
 install_tala_brew() {
   header "installing tala with homebrew"
-  sh_c brew tap terrastruct/d2
-  sh_c brew install tala
+  sh_c brew update
+  sh_c brew install terrastruct/tap/tala
 }
 
 uninstall() {

From d028915b7f88db8a587efb7b00f326258b75d704 Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@terrastruct.com>
Date: Wed, 7 Dec 2022 18:59:23 -0800
Subject: [PATCH 3/3] ci: Update

---
 ci/sub | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/sub b/ci/sub
index 79b9dadce..f668611e9 160000
--- a/ci/sub
+++ b/ci/sub
@@ -1 +1 @@
-Subproject commit 79b9dadce090a95b5a50d32f9ea3927845e5cce1
+Subproject commit f668611e9b1cfc335230ab6f8161cf87f74f174d