From afc61d24a318a92f6516dabbe349fb38bcb2211f Mon Sep 17 00:00:00 2001 From: Lotte Steenbrink Date: Tue, 20 Apr 2021 10:26:53 +0200 Subject: [PATCH 1/2] installation: add apt instructions alongside pacman instructions --- embedded-workshop-book/src/installation.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/embedded-workshop-book/src/installation.md b/embedded-workshop-book/src/installation.md index 4f0e5c0..392db1b 100644 --- a/embedded-workshop-book/src/installation.md +++ b/embedded-workshop-book/src/installation.md @@ -20,8 +20,11 @@ All programming will take place in its `beginner/` and `advanced/` subfolders. **Linux**: Check your Linux distribution package manager (example below). If it's not there, follow the instructions on [https://code.visualstudio.com/docs/setup/linux](https://code.visualstudio.com/docs/setup/linux). ``` console -$ # Arch Linux +$ # If you're using Arch Linux $ sudo pacman -S code + +$ # If you're using Ubuntu, search the Software Center or try +$ sudo snap install --classic code ``` **macOS**: Go to [https://code.visualstudio.com](https://code.visualstudio.com) and click on "Download for Mac" @@ -169,8 +172,11 @@ Installed package `flip-link v0.1.2` (..) **Linux**: Install `pip` using the package manager; this will also install Python. ``` console -$ # Arch Linux +$ # If you're using Arch Linux $ sudo pacman -S python-pip + +$ # If you're using Ubuntu +$ sudo apt-get install python3-pip ``` **macOS**: From 6a99976a12a88bf4093c516ec1a8fb54b4f186c4 Mon Sep 17 00:00:00 2001 From: Lotte Steenbrink Date: Tue, 20 Apr 2021 10:38:15 +0200 Subject: [PATCH 2/2] re Felix: don't half-duplicate Linux instructions --- embedded-workshop-book/src/installation.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/embedded-workshop-book/src/installation.md b/embedded-workshop-book/src/installation.md index 392db1b..0facda0 100644 --- a/embedded-workshop-book/src/installation.md +++ b/embedded-workshop-book/src/installation.md @@ -17,15 +17,7 @@ All programming will take place in its `beginner/` and `advanced/` subfolders. **Windows**: Go to [https://code.visualstudio.com](https://code.visualstudio.com) and run the installer. -**Linux**: Check your Linux distribution package manager (example below). If it's not there, follow the instructions on [https://code.visualstudio.com/docs/setup/linux](https://code.visualstudio.com/docs/setup/linux). - -``` console -$ # If you're using Arch Linux -$ sudo pacman -S code - -$ # If you're using Ubuntu, search the Software Center or try -$ sudo snap install --classic code -``` +**Linux**: Follow the instructions for your distribution on [https://code.visualstudio.com/docs/setup/linux](https://code.visualstudio.com/docs/setup/linux). **macOS**: Go to [https://code.visualstudio.com](https://code.visualstudio.com) and click on "Download for Mac"