Skip to content

Don't use arch in shell scripts #5480

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

Merged
sougou merged 2 commits into from
Dec 1, 2019
Merged

Don't use arch in shell scripts #5480

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51e7535
Don't use arch in shell scripts
morgo Nov 27, 2019
3196204
Merge remote-tracking branch 'upstream/master' into morgo-fix-arch
morgo Nov 29, 2019
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
9 changes: 4 additions & 5 deletions bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,11 @@ function install_dep() {
# 1. Installation of dependencies.
#

# Wrapper around the `arch` command which plays nice with OS X
# We should not use the arch command, since it is not reliably
# available on macOS or some linuxes:
# https://www.gnu.org/software/coreutils/manual/html_node/arch-invocation.html
function get_arch() {
case $(uname) in
Linux) arch;;
Darwin) uname -m;;
esac
uname -m
}


Expand Down
2 changes: 1 addition & 1 deletion dev.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export PKG_CONFIG_PATH

# According to https://github.com/etcd-io/etcd/blob/a621d807f061e1dd635033a8d6bc261461429e27/Documentation/op-guide/supported-platform.md,
# currently, etcd is unstable on arm64, so ETCD_UNSUPPORTED_ARCH should be set.
if [ "$(arch)" == aarch64 ]; then
if [ "$(uname -m)" == aarch64 ]; then
export ETCD_UNSUPPORTED_ARCH=arm64
fi

Expand Down