homebrew install tweaks

bin/install-brew.sh

@@ -1,19 +1,16 @@
 #!/bin/bash
 
-# give me /usr/local first
-#sudo chown -R "$USER" /usr/local
-
 # Install Homebrew
 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 
-# Make sure we’re using the latest Homebrew
+if [[ $(uname -m) == 'arm64' ]]; then
-brew update
+  PATH_HOMEBREW=/opt/homebrew
-
+else
-# Upgrade any already-installed formulae
+  PATH_HOMEBREW=/usr/local
-brew upgrade --all
+fi
 
 # Install what we need
-brew install \
+$PATH_HOMEBREW/bin/brew install \
     coreutils \
     zsh \
     zsh-syntax-highlighting \
@@ -34,4 +31,4 @@ brew install \
     clamav
 
 # Remove outdated versions from the cellar.
-brew cleanup
+$PATH_HOMEBREW/bin/brew cleanup

bin/install.sh

@@ -54,9 +54,15 @@ echo "                 ✓ done$(tput sgr0)"
 # ----------------------------------------------------------------------
 
 # Switch to using brew-installed zsh as default shell
-if ! grep -F -q '/opt/homebrew/bin/zsh' /etc/shells; then
+if [[ $(uname -m) == 'arm64' ]]; then
-  echo '/opt/homebrew/bin/zsh' | sudo tee -a /etc/shells;
+  PATH_HOMEBREW=/opt/homebrew
-  chsh -s /opt/homebrew/bin/zsh;
+else
+  PATH_HOMEBREW=/usr/local
+fi
+
+if ! grep -F -q "$PATH_HOMEBREW/bin/zsh" /etc/shells; then
+  echo "$PATH_HOMEBREW/bin/zsh" | sudo tee -a /etc/shells;
+  chsh -s $PATH_HOMEBREW/bin/zsh;
 fi;
 
 echo "$(tput setaf 64)============================================="

exports

@@ -17,6 +17,8 @@ else
   PATH_HOMEBREW=/usr/local
 fi
 
+export PATH_HOMEBREW
+
 PATH_OPENSSL=$PATH_HOMEBREW/opt/openssl/bin
 # PATH_RUBY=$(brew --prefix ruby)/bin
 # PATH_GEMS=$PATH_HOMEBREW/lib/ruby/gems/2.6.0/bin