about summary refs log tree commit diff
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-03-28 18:12:04 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-03-28 18:12:04 +0530
commit474062da5dfa2f942a7aa9f97ec5c7ce3a64657a (patch)
tree8c9957bc3255e1edb5263656cf5b3e0830e38fe1
parentf8b6e28e758231f611e8e7923aa607cebd150717 (diff)
parentb3c58cffa439beccccdf348a7a791a4e4766ab89 (diff)
downloadrust-474062da5dfa2f942a7aa9f97ec5c7ce3a64657a.tar.gz
rust-474062da5dfa2f942a7aa9f97ec5c7ce3a64657a.zip
Rollup merge of #23332 - jakub-:rustup-curl-silent-flag, r=brson
curl's progress meter would otherwise interfere with sudo's password prompt.

In addition, add the -f flag to make sure 4xx status codes are treated as errors.

r? @brson 
-rw-r--r--src/doc/trpl/installing-rust.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/doc/trpl/installing-rust.md b/src/doc/trpl/installing-rust.md
index 0dc83f95f43..288a4a158fb 100644
--- a/src/doc/trpl/installing-rust.md
+++ b/src/doc/trpl/installing-rust.md
@@ -6,14 +6,14 @@ Linux or a Mac, all you need to do is this (note that you don't need to type
 in the `$`s, they just indicate the start of each command):
 
 ```bash
-$ curl -L https://static.rust-lang.org/rustup.sh | sudo sh
+$ curl -sf -L https://static.rust-lang.org/rustup.sh | sudo sh
 ```
 
 If you're concerned about the [potential insecurity](http://curlpipesh.tumblr.com/) of using `curl | sudo sh`,
 please keep reading and see our disclaimer below. And feel free to use a two-step version of the installation and examine our installation script:
 
 ```bash
-$ curl -L https://static.rust-lang.org/rustup.sh -O
+$ curl -f -L https://static.rust-lang.org/rustup.sh -O
 $ sudo sh rustup.sh
 ```