From b6861fc2c948d73199a19f22a47e10059b395df4 Mon Sep 17 00:00:00 2001 From: Julien Richard-Foy Date: Tue, 14 Feb 2023 10:20:40 +0100 Subject: [PATCH 1/3] Fix setup instructions --- _data/setup-scala.yml | 6 ++++-- _overviews/getting-started/index.md | 13 ++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/_data/setup-scala.yml b/_data/setup-scala.yml index d1bb19a78d..4cce17dd0d 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/_overviews/getting-started/index.md b/_overviews/getting-started/index.md index 5510d479cd..4c2a4ac863 100644 --- a/_overviews/getting-started/index.md +++ b/_overviews/getting-started/index.md @@ -52,15 +52,22 @@ Install it on your system with the following instructions. 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 %} {% altDetails cs-setup-macos-nobrew "Alternatively, if you don't use Homebrew:" %} - {% 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 %} {% endaltDetails %} {% endtab %} {% tab Linux for=install-cs-setup-tabs %} - 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 %} {% endtab %} From e91be159f70549dbbbab86e09afabbb2979f9544 Mon Sep 17 00:00:00 2001 From: Julien Richard-Foy Date: Tue, 14 Feb 2023 10:26:03 +0100 Subject: [PATCH 2/3] Update translated pages --- _fr/getting-started/index.md | 4 ++-- _ja/getting-started/index.md | 4 ++-- _ru/getting-started/index.md | 4 ++-- _uk/getting-started/index.md | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/_fr/getting-started/index.md b/_fr/getting-started/index.md index 4b73224c27..a94b708cb0 100644 --- a/_fr/getting-started/index.md +++ b/_fr/getting-started/index.md @@ -34,14 +34,14 @@ Installez-le sur votre système avec les instructions suivantes. {% tab macOS for=install-cs-setup-tabs %} {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-brew %} {% altDetails cs-setup-macos-nobrew "Alternativement, si vous n'utilisez pas Homebrew:" %} - {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-default %} + {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-x86-64 %} {% endaltDetails %} {% endtab %} {% tab Linux for=install-cs-setup-tabs %} - {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.linux %} + {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.linux-x86-64 %} {% endtab %} diff --git a/_ja/getting-started/index.md b/_ja/getting-started/index.md index 40f6b384bd..a72dab82b9 100644 --- a/_ja/getting-started/index.md +++ b/_ja/getting-started/index.md @@ -34,14 +34,14 @@ Scala のインストーラーは[Coursier](https://get-coursier.io/docs/cli-ove {% tab macOS for=install-cs-setup-tabs %} {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-brew %} {% altDetails cs-setup-macos-nobrew "または、Homebrewを使用しない場合は" %} - {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-default %} + {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-x86-64 %} {% endaltDetails %} {% endtab %} {% tab Linux for=install-cs-setup-tabs %} - {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.linux %} + {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.linux-x86-64 %} {% endtab %} diff --git a/_ru/getting-started/index.md b/_ru/getting-started/index.md index 4d49594778..e9d8e0beeb 100644 --- a/_ru/getting-started/index.md +++ b/_ru/getting-started/index.md @@ -53,7 +53,7 @@ newcomer_resources: Запустите в терминале следующую команду, следуя инструкциям на экране: {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-brew %} {% altDetails cs-setup-macos-nobrew "В качестве альтернативы, если вы не используете Homebrew:" %} - {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-default %} + {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-x86-64 %} {% endaltDetails %} {% endtab %} @@ -61,7 +61,7 @@ newcomer_resources: {% tab Linux for=install-cs-setup-tabs %} Запустите в терминале следующую команду, следуя инструкциям на экране: - {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.linux %} + {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.linux-x86-64 %} {% endtab %} diff --git a/_uk/getting-started/index.md b/_uk/getting-started/index.md index 5fd096359c..e8275ada94 100644 --- a/_uk/getting-started/index.md +++ b/_uk/getting-started/index.md @@ -38,7 +38,7 @@ _Scastie_ це онлайн “пісочниця”, де ви можете е Виконайте наступну команду в терміналі, виконуючи всі спливаючі інструкції: {% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-brew %} {% altDetails cs-setup-macos-nobrew "Якщо ви не використовуєте Homebrew:" %} -{% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-default %} +{% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-x86-64 %} {% endaltDetails %} {% endtab %} @@ -46,7 +46,7 @@ _Scastie_ це онлайн “пісочниця”, де ви можете е {% tab Linux for=install-cs-setup-tabs %} Виконайте наступну команду в терміналі, виконуючи всі спливаючі інструкції: -{% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.linux %} +{% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.linux-x86-64 %} {% endtab %} From 23dc8ba9e34af3451976496ec39057a780856f76 Mon Sep 17 00:00:00 2001 From: Julien Richard-Foy Date: Wed, 15 Feb 2023 16:44:38 +0100 Subject: [PATCH 3/3] Adjust suggestion for Apple Silicon users --- _overviews/getting-started/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_overviews/getting-started/index.md b/_overviews/getting-started/index.md index 4c2a4ac863..8c33b915dd 100644 --- a/_overviews/getting-started/index.md +++ b/_overviews/getting-started/index.md @@ -51,7 +51,7 @@ Install it on your system with the following instructions. {% tab macOS for=install-cs-setup-tabs %} 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 %} -{% altDetails cs-setup-macos-nobrew "Alternatively, if you don't use Homebrew:" %} +{% altDetails cs-setup-macos-nobrew "Alternatively for Apple Silicon, or if you don't use Homebrew:" %} 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: