Skip to content

Fix setup instructions #1469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 15, 2023
Merged

Fix setup instructions #1469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae9fd3e
Fix setup instructions
julienrf Feb 14, 2023
6552c01
Adjust suggestion for Apple Silicon users
julienrf Feb 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions _data/setup-scala.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
7 changes: 5 additions & 2 deletions _install_tabs/1-macos.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions _install_tabs/2-linux.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>