diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-02-15 18:36:35 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-02-15 18:42:48 +0530 |
| commit | 97503e1c1e3febedcd8f528a86d1da85cf9584c8 (patch) | |
| tree | 3b221bbfe2058594b212b3a19f91ee876f98204f /src | |
| parent | 16b24f15bd042c4f97e1d4826d82c992c0228684 (diff) | |
| parent | 9df38bf6583ff27e5184513b397955d3b169bbdf (diff) | |
| download | rust-97503e1c1e3febedcd8f528a86d1da85cf9584c8.tar.gz rust-97503e1c1e3febedcd8f528a86d1da85cf9584c8.zip | |
Rollup merge of #22256 - brson:installer-next, r=alexcrichton
Highlights:
* Adds an 'uninstall.sh' script to `/usr/local/lib/rustlib/uninstall.sh`, the path to which is printed during installation.
* Components can be deselected during install, like `install.sh --without=rust-docs`.
* Components can be listed with `install.sh --list-components`.
* Vastly reduces spew during install (but supporting a `--verbose` option).
Typicall install run looks like:
```
brian@brianX1:~/dev/multirustā« sudo ./install.sh
[sudo] password for brian:
install: creating uninstall script at /usr/local/lib/rustlib/uninstall.sh
install: installing component 'rustc'
install: installing component 'cargo'
install: installing component 'rust-docs'
Rust is ready to roll.
```
Needs to be merged right before corresponding PRs to cargo and rust-packaging.
Fixes https://github.com/rust-lang/rust/issues/21117
Fixes https://github.com/rust-lang/rust/issues/20283
Diffstat (limited to 'src')
| -rw-r--r-- | src/doc/trpl/installing-rust.md | 6 | ||||
| m--------- | src/rust-installer | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/doc/trpl/installing-rust.md b/src/doc/trpl/installing-rust.md index 80288c4c3d9..5bc33d0a232 100644 --- a/src/doc/trpl/installing-rust.md +++ b/src/doc/trpl/installing-rust.md @@ -24,11 +24,11 @@ installer](https://static.rust-lang.org/dist/rust-nightly-x86_64-pc-windows-gnu. and run it. If you decide you don't want Rust anymore, we'll be a bit sad, but that's okay. -Not every programming language is great for everyone. Just pass an argument to -the script: +Not every programming language is great for everyone. Just run the uninstall +script: ```bash -$ curl -s https://static.rust-lang.org/rustup.sh | sudo sh -s -- --uninstall +$ sudo /usr/local/lib/rustlib/uninstall.sh ``` If you used the Windows installer, just re-run the `.exe` and it will give you diff --git a/src/rust-installer b/src/rust-installer -Subproject e577c97b494be2815b215e3042207d6d4b7c551 +Subproject 60fd8abfcae50629a3fc664bd809238fed03961 |