From 2ebccfab6aaafb858125e7f85b82b0ebcbbb6c43 Mon Sep 17 00:00:00 2001 From: Simon Let Date: Fri, 24 Jan 2020 14:22:40 +0100 Subject: [PATCH] add arm and arm64 to rawinstall script --- scripts/rawinstall.sh | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/scripts/rawinstall.sh b/scripts/rawinstall.sh index dbd2967..a7279c5 100755 --- a/scripts/rawinstall.sh +++ b/scripts/rawinstall.sh @@ -49,18 +49,37 @@ else OS=unknown fi -if [ "$(uname -m)" = "x86_64" ]; then +case "$(uname -m)" in +x86_64) ARCH=amd64 -elif [ "$(uname -m)" = "x86" ] || [ "$(uname -m)" = "i386" ] || [ "$(uname -m)" = "i686" ]; then + ;; +x86|i386|i686) ARCH=386 -else + ;; +arm64|aarch64|armv8b|armv8l) + ARCH=arm64 + ;; +arm) + ARCH=armv6 + ;; +*) ARCH=unknown -fi + ;; +esac +if [ "$OS" = darwin ]; then + if [ "$ARCH" = armv6 ] || [ "$ARCH" = arm64 ]; then + echo "It seems that you are running macOS on arm - exiting!" + echo "Expected Linux or macOS on x86_64 or i386 (or Linux on arm or arm64)" + echo "Got OS: $(uname) (uname)" + echo "Got ARCH: $(uname -m) (uname -m)" + exit 1 + fi +fi if [ "$OS" = unknown ] || [ "$ARCH" = unknown ]; then echo "Couldn't detect your OS and architecture - exiting!" - echo "Expected Linux or macOS on x86_64 or i386" + echo "Expected Linux or macOS on x86_64 or i386 (or Linux on arm or arm64)" echo "Got OS: $(uname) (uname)" echo "Got ARCH: $(uname -m) (uname -m)" exit 1