From a2071fc41b1be32b19dee55cfa19e5099927ad29 Mon Sep 17 00:00:00 2001 From: Takeshi Suzuki Date: Sat, 24 Mar 2018 23:58:26 -0500 Subject: [PATCH 1/2] Fix unfinished sentence in CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b786678..cd69eb6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -43,7 +43,7 @@ A bit more formal way of communication with fellow Redox devs, but a little less ### Pull Requests -It's fine to just submit a small pull request without first making an issue or asking in the chat, but if it's a significant change that will require a lot of **planning and reviewing**. Also see [Creating a Pull Request](#creating-a-pr) and [Git Style Guidelines](#git-style-guidelines). +It's fine to just submit a small pull request without first making an issue or asking in the chat, **unless** it's a significant change that will require a lot of planning and reviewing. Also see [Creating a Pull Request](#creating-a-pr) and [Git Style Guidelines](#git-style-guidelines). ### Discourse From b57095d2c24a394e2ae444164e9705b03d94d739 Mon Sep 17 00:00:00 2001 From: Nagy Tibor Date: Tue, 3 Apr 2018 01:43:26 +0200 Subject: [PATCH 2/2] Update build steps After installing rustup the PATH variable needs to be updated for the current shell to be able to use cargo. The installer even warns about this. Possible fix for #1176. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f495865..80bd2b8 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ $ cd path/to/your/projects/folder/ # Run bootstrap setup $ curl -sf https://raw.githubusercontent.com/redox-os/redox/master/bootstrap.sh -o bootstrap.sh && bash -e bootstrap.sh -#Change to project directory +# Change to project directory $ cd redox # Build Redox @@ -139,6 +139,7 @@ $ ./bootstrap.sh -d # Install rustup.rs $ curl https://sh.rustup.rs -sSf | sh +$ source $HOME/.cargo/env # Install the sysroot manager Xargo $ cargo install xargo