Merge pull request #1469 from scalacenter/fix-setup

Fix setup instructions

Author: julienrf

_data/setup-scala.yml

@@ -1,4 +1,6 @@
-linux: curl -fL https://github.com/coursier/launchers/raw/master/cs-x86_64-pc-linux.gz | gzip -d > cs && chmod +x cs && ./cs setup
-macOS-default: curl -fL https://github.com/coursier/launchers/raw/master/cs-x86_64-apple-darwin.gz | gzip -d > cs && chmod +x cs && (xattr -d com.apple.quarantine cs || true) && ./cs setup
+linux-x86-64: curl -fL https://github.com/coursier/launchers/raw/master/cs-x86_64-pc-linux.gz | gzip -d > cs && chmod +x cs && ./cs setup
+linux-arm64: curl -fL https://github.com/VirtusLab/coursier-m1/releases/latest/download/cs-aarch64-pc-linux.gz | gzip -d > cs && chmod +x cs && ./cs setup
+macOS-x86-64: curl -fL https://github.com/coursier/launchers/raw/master/cs-x86_64-apple-darwin.gz | gzip -d > cs && chmod +x cs && (xattr -d com.apple.quarantine cs || true) && ./cs setup
+macOS-arm64: curl -fL https://github.com/VirtusLab/coursier-m1/releases/latest/download/cs-aarch64-apple-darwin.gz | gzip -d > cs && chmod +x cs && (xattr -d com.apple.quarantine cs || true) && ./cs setup
 macOS-brew: brew install coursier/formulas/coursier && cs setup
 windows-link: https://github.com/coursier/launchers/raw/master/cs-x86_64-pc-win32.zip

_install_tabs/1-macos.html

@@ -6,10 +6,13 @@
   <div class="wrap">
     <p>Run the following command in your terminal, following the on-screen instructions:</p>
     {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-brew %}
-    {% assign homebrewAlt = "Alternatively, if you don't use Homebrew:" %}
+    {% assign homebrewAlt = "Alternatively for Apple Silicon, or if you don't use Homebrew:" %}
     {% capture homebrewDetail %}
     <div class="wrap-narrow">
-      {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-default %}
+      <p>On the Apple Silicon (M1, M2, …) architecture:</p>
+      {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-arm64 %}
+      <p>Otherwise, on the x86-64 architecture:</p>
+      {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-x86-64 %}
     </div>
     {% endcapture %}
     {% include alt-details.html

_install_tabs/2-linux.html

@@ -4,7 +4,10 @@
 ---
 <div class="text-step wrap-inline">
   <div class="wrap">
-    <p>Run the following command in your terminal, following the on-screen instructions:</p>
-    {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.linux %}
+    <p>Run the following command in your terminal, following the on-screen instructions.</p>
+    <p>On the x86-64 architecture:</p>
+    {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.linux-x86-64 %}
+    <p>Otherwise, on the ARM64 architecture:</p>
+    {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.linux-arm64 %}
   </div>
 </div>