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..65f505720 100644 --- a/_install_tabs/1-macos.html +++ b/_install_tabs/1-macos.html @@ -6,10 +6,13 @@

Run the following command in your terminal, following the on-screen instructions:

{% 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 %}
- {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-default %} +

On the Apple Silicon (M1, M2, …) architecture:

+ {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-arm64 %} +

Otherwise, on the x86-64 architecture:

+ {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-x86-64 %}
{% 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 @@ ---
-

Run the following command in your terminal, following the on-screen instructions:

- {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.linux %} +

Run the following command in your terminal, following the on-screen instructions.

+

On the x86-64 architecture:

+ {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.linux-x86-64 %} +

Otherwise, on the ARM64 architecture:

+ {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.linux-arm64 %}