From f4f46c459bd75971a843373a2aa349f728534230 Mon Sep 17 00:00:00 2001 From: Robert Peteuil Date: Thu, 2 Jan 2020 16:03:35 -0700 Subject: [PATCH] add arm processor detection --- terraform-install.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/terraform-install.sh b/terraform-install.sh index 1091424..054b77a 100755 --- a/terraform-install.sh +++ b/terraform-install.sh @@ -14,8 +14,8 @@ set -e # sudoInstall=true scriptname=$(basename "$0") -scriptbuildnum="1.5.1" -scriptbuilddate="2018-10-19" +scriptbuildnum="1.5.2" +scriptbuilddate="2020-01-02" # CHECK DEPENDANCIES AND SET NET RETRIEVAL TOOL if ! unzip -h 2&> /dev/null; then @@ -98,7 +98,10 @@ if [[ -z "$VERSION" ]]; then fi OS=$(uname -s | tr '[:upper:]' '[:lower:]') if [[ "$OS" == "linux" ]]; then - PROC=$(lscpu 2> /dev/null | awk '/Architecture/ {if($2 == "x86_64") {print "amd64"; exit} else {print "386"; exit}}') + PROC=$(lscpu 2> /dev/null | awk '/Architecture/ {if($2 == "x86_64") {print "amd64"; exit} else if($2 ~ /arm/) {print "arm"; exit} else {print "386"; exit}}') + if [[ -z $PROC ]]; then + PROC=$(cat /proc/cpuinfo | awk '/model\ name/ {if($0 ~ /ARM/) {print "arm"; exit}}') + fi if [[ -z $PROC ]]; then PROC=$(cat /proc/cpuinfo | awk '/flags/ {if($0 ~ /lm/) {print "amd64"; exit} else {print "386"; exit}}') fi