fix: check for rosetta in shell #941
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mistydemeo
force-pushed
the
installer-arm-rosetta-2-mac
branch
from
ce49837 to
f8fef04
Compare
mistydemeo
commented
Apr 16, 2024
| @@ -627,6 +627,13 @@ get_architecture() { | |||
| fi | |||
| fi | |||
|
|
|||
| if [ "$_ostype" = Darwin ] && [ "$_cputype" = x86_64 ]; then | |||
| # Rosetta on aarch64 | |||
| if [ "$(sysctl -n hw.optional.arm64 2>/dev/null)" = "1" ]; then | |||
There was a problem hiding this comment.
I used sysctl -n instead of piping into grep for a bit of a cleaner comparison.
Gankra
approved these changes
Apr 17, 2024
|
Confirmed this works when running in both rosetta and non-rosetta shells on arm64. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We inherited a check for the old-style Mac
uname -mreporting on Intel from rustup, but we're missing a case to check for Rosetta under aarch64. Makes sense to me to add one and always install the aarch64 binary even if the installer's being run from within an Intel Rosetta shell.