Skip to content

Use brew --prefix for PATH in build-mac-dmg.sh (Apple Silicon support) #6005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
geekrebel wants to merge 1 commit into
base: develop
Choose a base branch
from
+10 −3
Open

Use brew --prefix for PATH in build-mac-dmg.sh (Apple Silicon support) #6005

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions installer/build-mac-dmg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
#!/bin/sh

# XXX: These paths should be set using `brew prefix` commands,
# for future-proofing against upgrades
PATH=/usr/local/Cellar/python@3.7/3.7.9_2/Frameworks/Python.framework/Versions/3.7/bin:/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/qt5/5.5/clang_64/bin:/opt/X11/bin
# Detect Homebrew prefix so this script works on both Apple Silicon
# (/opt/homebrew) and Intel (/usr/local) Macs without hard-coded paths.
if [ -x /opt/homebrew/bin/brew ]; then
BREW_PREFIX="$(/opt/homebrew/bin/brew --prefix)"
elif [ -x /usr/local/bin/brew ]; then
BREW_PREFIX="$(/usr/local/bin/brew --prefix)"
else
BREW_PREFIX="/usr/local"
fi
PATH="${BREW_PREFIX}/bin:${BREW_PREFIX}/sbin:/opt/local/bin:/opt/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin"
MAC_NOTARIZE_PASSWORD=$1

# Get Version
Expand Down