Skip to content
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

Jump to bottom

feat: adds support for big sur in curl installer #297

Merged
merged 2 commits into from
Feb 22, 2021
Merged

feat: adds support for big sur in curl installer #297

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1ded73
feat: adds support for darwin arm64 in curl installer
EverlastingBugstopper Feb 19, 2021
78c1a57
Merge branch 'main' into avery/test-big-sur
EverlastingBugstopper Feb 22, 2021
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
14 changes: 10 additions & 4 deletions installers/binstall/scripts/nix/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ download_binary_and_run_installer() {
local _file="$_dir/input.tar.gz"
local _rover="$_dir/rover$_ext"

say "downloading rover" 1>&2
say "downloading rover from $_url" 1>&2

ensure mkdir -p "$_dir"
downloader "$_url" "$_file"
Expand Down Expand Up @@ -86,6 +86,13 @@ get_architecture() {
fi
fi

if [ "$_ostype" = Darwin -a "$_cputype" = arm64 ]; then
# Darwin `uname -s` doesn't seem to lie on Big Sur
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, that's interesting!

# but we want to serve x86_64 binaries anyway that they can
# then run in x86_64 emulation mode on their arm64 devices
local _cputype=x86_64
fi

case "$_ostype" in
Linux)
local _ostype=unknown-linux-musl
Expand All @@ -106,7 +113,6 @@ get_architecture() {

case "$_cputype" in
x86_64 | x86-64 | x64 | amd64)
local _cputype=x86_64
;;
*)
err "no precompiled binaries available for CPU architecture: $_cputype"
Expand All @@ -122,13 +128,13 @@ get_architecture() {
say() {
local green=`tput setaf 2`
local reset=`tput sgr0`
echo " ${green}INFO${reset} sh::wrapper: $1"
echo "$1"
}

err() {
local red=`tput setaf 1`
local reset=`tput sgr0`
say " ${red}ERROR${reset} sh::wrapper: $1" >&2
say "${red}ERROR${reset}: $1" >&2
exit 1
}

Expand Down