From 31997892710a0bafb07651304b8104686c694cea Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Wed, 22 Sep 2021 14:37:33 +0200
Subject: [PATCH] tools-setup: don't use homebrew to install coursier

This is broken for some
people (https://github.com/coursier/coursier/issues/1946).

Fixes #46.
---
 labs/tools-setup.md | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/labs/tools-setup.md b/labs/tools-setup.md
index 5e6a7ac..1f74c96 100644
--- a/labs/tools-setup.md
+++ b/labs/tools-setup.md
@@ -20,10 +20,10 @@ and fill in [this table](https://docs.google.com/spreadsheets/d/12KvfD_jN5AcApmW
 We will use coursier to install the correct version of
 Java as well as the sbt build tool:
 
-### On Linux
+### On Linux and macOS
 
 ```shell
-curl -fLo cs https://git.io/coursier-cli-linux
+curl -fLo cs https://git.io/coursier-cli-"$(uname | tr LD ld)"
 ```
 ```shell
 chmod +x cs
@@ -34,25 +34,6 @@ chmod +x cs
 
 Please reboot after this point.
 
-### On macOS
-
-First, install the Homebrew package manager:
-```shell
-/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-```
-Use Homebrew to install coursier:
-```scala
-brew install coursier/formulas/coursier
-```
-```shell
-[ -f ~/.bash_profile ] && sudo chmod 0666 ~/.bash_profile
-```
-```shell
-cs setup -y --jvm 8 --apps sbt
-```
-
-Please close this terminal and open a new one after this point.
-
 ### On Windows
 
 Download and install the [Visual C++ 2010 SP1 Redistributable
@@ -113,6 +94,14 @@ sudo apt update && sudo apt install git
 
 ### On macOS
 
+First, install the Homebrew package manager:
+
+```shell
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+```
+
+Use Homebrew to install git:
+
 ```shell
 brew install git
 ```
-- 
GitLab