Merge pull request #406 from nhooyr/update-48bf

install.sh: Updates
This commit is contained in:
Anmol Sethi 2022-12-07 19:50:23 -08:00 committed by GitHub
commit 1085663f7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 18 deletions

View file

@ -347,7 +347,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
}
@ -390,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() {
@ -502,11 +502,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.

2
ci/sub

@ -1 +1 @@
Subproject commit 79b9dadce090a95b5a50d32f9ea3927845e5cce1
Subproject commit f668611e9b1cfc335230ab6f8161cf87f74f174d

View file

@ -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
```

View file

@ -930,7 +930,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
}
@ -973,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() {
@ -1085,11 +1085,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.