Support both Apple Silicon and Intel in Homebrew

Author: webpro

Makefile

@@ -2,6 +2,7 @@ SHELL = /bin/bash
 DOTFILES_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 OS := $(shell bin/is-supported bin/is-macos macos linux)
 PATH := $(DOTFILES_DIR)/bin:$(PATH)
+HOMEBREW_PREFIX := $(shell bin/is-supported bin/is-arm64 /opt/homebrew /usr/local)
 export XDG_CONFIG_HOME = $(HOME)/.config
 export STOW_DIR = $(DOTFILES_DIR)
 export ACCEPT_EULA=Y
@@ -51,7 +52,7 @@ unlink: stow-$(OS)
 brew:
 	is-executable brew || curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh | bash
 
-bash: BASH=/usr/local/bin/bash
+bash: BASH=$(HOMEBREW_PREFIX)/bin/bash
 bash: SHELLS=/private/etc/shells
 bash: brew
 ifdef GITHUB_ACTION

bin/is-arm64

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+if [[ "$(uname -m)" == "arm64" ]]; then
+  exit 0
+else
+  exit 1
+fi

runcom/.bash_profile

@@ -3,13 +3,11 @@
 [ -z "$PS1" ] && return
 
 # Resolve DOTFILES_DIR (assuming ~/.dotfiles on distros without readlink and/or $BASH_SOURCE/$0)
-
-READLINK=$(which greadlink 2>/dev/null || which readlink)
 CURRENT_SCRIPT=$BASH_SOURCE
 
-if [[ -n $CURRENT_SCRIPT && -x "$READLINK" ]]; then
-  SCRIPT_PATH=$($READLINK -f "$CURRENT_SCRIPT")
-  DOTFILES_DIR=$(dirname "$(dirname "$SCRIPT_PATH")")
+if [[ -n $CURRENT_SCRIPT && -x readlink ]]; then
+  SCRIPT_PATH=$(readlink -n $CURRENT_SCRIPT)
+  DOTFILES_DIR="${PWD}/$(dirname $(dirname $SCRIPT_PATH))"
 elif [ -d "$HOME/.dotfiles" ]; then
   DOTFILES_DIR="$HOME/.dotfiles"
 else
@@ -49,7 +47,7 @@ fi
 
 # Clean up
 
-unset READLINK CURRENT_SCRIPT SCRIPT_PATH DOTFILE EXTRAFILE
+unset CURRENT_SCRIPT SCRIPT_PATH DOTFILE EXTRAFILE
 
 # Export
 

system/.path

@@ -3,14 +3,16 @@
 
 is-executable getconf && PATH=$($(command -v getconf) PATH)
 
+export HOMEBREW_PREFIX=$($DOTFILES_DIR/bin/is-supported $DOTFILES_DIR/bin/is-arm64 /opt/homebrew /usr/local)
+
 # Prepend new items to path (if directory exists)
 
 prepend-path "/bin"
 prepend-path "/usr/bin"
-prepend-path "/usr/local/bin"
-prepend-path "/usr/local/opt/coreutils/libexec/gnubin"
-prepend-path "/usr/local/opt/gnu-sed/libexec/gnubin"
-prepend-path "/usr/local/opt/grep/libexec/gnubin"
+prepend-path "$HOMEBREW_PREFIX/bin"
+prepend-path "$HOMEBREW_PREFIX/opt/coreutils/libexec/gnubin"
+prepend-path "$HOMEBREW_PREFIX/opt/gnu-sed/libexec/gnubin"
+prepend-path "$HOMEBREW_PREFIX/opt/grep/libexec/gnubin"
 prepend-path "/usr/local/opt/python/libexec/bin"
 prepend-path "/usr/local/opt/ruby/bin"
 prepend-path "$DOTFILES_DIR/bin"