Skip to content

Proposed fix #319 - non-portable uname -i use #320

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Proposed fix #319 - non-portable uname -i use #320

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3470db0
Proposed fix #319 - non-portable `uname -i` use
krayon Mar 15, 2018
870223e
Make unsupported arch error clearer
krayon Mar 18, 2018
4b7b326
Requested changes to #319 fix
krayon Jun 1, 2018
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: 9 additions & 5 deletions functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,23 @@ case "$(uname -i)" in
# arm*)
# echo "ARM system architecture"
# SYSTEM_ARCH="";;
unknown|AuthenticAMD|GenuineIntel)
# uname -i not answer on debian, then:
*)
# uname '-i' isn't portable so when failing, fall back to uname's
# recommended switch '-m':
case "$(uname -m)" in
x86_64|amd64)
# echo "x86-64 system architecture"
SYSTEM_ARCH="x86_64";;
i?86)
# echo "x86 system architecture"
SYSTEM_ARCH="i686";;
# arm*|aarch*)
# echo "ARM system architecture"
# SYSTEM_ARCH="";;
*)
echo "Unsupported system architecture: $(uname -m)"
exit 1;;
esac ;;
*)
echo "Unsupported system architecture"
exit 1;;
esac

# Either get the file from remote or from a static place.
Expand Down