Added architecture detection, and rosetta warning

HPE · Jul 7, 2021 · 0f1a51e · 0f1a51e
1 parent 8618884
commit 0f1a51e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -30,7 +30,10 @@ VERSION=v0.0.5 bash <(curl -sL https://raw.githubusercontent.com/HewlettPackard/
 
 Before using the install script, install GNU grep via homebrew with `brew install grep`
 
-Use the script `tools/install-hpegl-provider-macos.sh` (or `tools/install-hpegl-provider-macos-m1.sh` on an Apple Silicon machine) to automatically download and install hpegl provider:
+**Please note: Running a terminal on Apple Silicon through Rosetta will return the wrong architecture for the machine, installing amd64 rather than arm64**
+
+Use the script `tools/install-hpegl-provider-macos.sh` to automatically download and install hpegl provider:
+
 
 ```shell
 bash <(curl -sL https://raw.githubusercontent.com/HewlettPackard/terraform-provider-hpegl/main/tools/install-hpegl-provider-macos.sh)

diff --git a/tools/install-hpegl-provider-macos-m1.sh b/tools/install-hpegl-provider-macos-m1.sh
diff --git a/tools/install-hpegl-provider-macos.sh b/tools/install-hpegl-provider-macos.sh
@@ -3,7 +3,17 @@
 set -e
 
 os="darwin"
-arch="amd64"
+
+if [[ `uname -m` == 'x86_64']] 
+then
+  echo 'Intel Architecture detected'
+  arch="amd64"
+elif [[ `uname -m` == 'arm64' ]] 
+then
+  echo 'Apple Silicon Architecture detected'
+  arch="arm64"
+fi
+
 repo="HewlettPackard/terraform-provider-hpegl"
 macos_hpegl_dir="${HOME}/.terraform.d/plugins/registry.terraform.io/hewlettpackard/hpegl"