From ae9fd3ee505e3dc97309f218de5bfce85a401328 Mon Sep 17 00:00:00 2001
From: Julien Richard-Foy <julien@richard-foy.fr>
Date: Tue, 14 Feb 2023 10:38:43 +0100
Subject: [PATCH 1/2] Fix setup instructions

---
 _data/setup-scala.yml      | 6 ++++--
 _install_tabs/1-macos.html | 5 ++++-
 _install_tabs/2-linux.html | 7 +++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/_data/setup-scala.yml b/_data/setup-scala.yml
index d1bb19a78..4cce17dd0 100644
--- a/_data/setup-scala.yml
+++ b/_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
diff --git a/_install_tabs/1-macos.html b/_install_tabs/1-macos.html
index c3cf09c43..26d03664f 100644
--- a/_install_tabs/1-macos.html
+++ b/_install_tabs/1-macos.html
@@ -9,7 +9,10 @@
     {% assign homebrewAlt = "Alternatively, 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
diff --git a/_install_tabs/2-linux.html b/_install_tabs/2-linux.html
index b7d89ff35..1555f8b5f 100644
--- a/_install_tabs/2-linux.html
+++ b/_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>

From 6552c019093358b97d2b07924e89f872340d23d3 Mon Sep 17 00:00:00 2001
From: Julien Richard-Foy <julien@richard-foy.fr>
Date: Wed, 15 Feb 2023 16:43:49 +0100
Subject: [PATCH 2/2] Adjust suggestion for Apple Silicon users

---
 _install_tabs/1-macos.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_install_tabs/1-macos.html b/_install_tabs/1-macos.html
index 26d03664f..65f505720 100644
--- a/_install_tabs/1-macos.html
+++ b/_install_tabs/1-macos.html
@@ -6,7 +6,7 @@
   <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">
       <p>On the Apple Silicon (M1, M2, …) architecture:</p>