From 070d9625a2df831ca7c562beef06716f71d1c8e7 Mon Sep 17 00:00:00 2001 From: rundrop1 Date: Mon, 13 Apr 2015 19:49:53 -0500 Subject: [PATCH 1/6] Create pgp.key Added Keyfile in Docs for documentation purposes. --- src/doc/trpl/pgp.key | 85 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 src/doc/trpl/pgp.key diff --git a/src/doc/trpl/pgp.key b/src/doc/trpl/pgp.key new file mode 100644 index 0000000000000..cf6abeea5fea3 --- /dev/null +++ b/src/doc/trpl/pgp.key @@ -0,0 +1,85 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 +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 +Mve696B5tlHyc1KxjHR6w9GRsh4= +=5FXw +-----END PGP PUBLIC KEY BLOCK----- From 0349d63c119b3c6111b5937ca2c73da4fd802080 Mon Sep 17 00:00:00 2001 From: rundrop1 Date: Mon, 13 Apr 2015 20:09:56 -0500 Subject: [PATCH 2/6] Update installing-rust.md Changed quite a bit. Here's a quick rundown: Multirust takes the center stage of rust installation and version management. I'm planning on adding an "Advanced MultiRust Configuration" section or page for the rest of the README.md for multirust either tonight or tomorrow. I also included uninstall instructions and rephrased (aka took extreme liberties) with the mannerisms of the document. I thought some of the vernacular made us sound a bit snobby or rushed (s/Congrats/Yay!) Documentation and where to find it has been moved to the forefront of the installation page. In the past I have found it tedious to try and collect the relevant information for a project, hopefully this format will put what information is available up front so people can get it BEFORE installing. All of the completely removed segments have made another appearance in the document. I haven't removed any pertinent information. I also added the location of the public PGP key and dropped a copy of it in ../doc/trpl/pgp.key I didn't see it otherwise in the document. In regards to taking liberties with including multirust 5:23PM steveklabnik: Lurkin: i asked brson about doing that and he said it wasn't ready for that kind of prime time yet Personally I think it's better than the self admittedly sketchy $ sudo curl -fs /git/rust | install.sh, I think it's even better if we remove the sketchy awareness from the first page of the book so it doesn't look like y'all built this thing on sand. I am "Lurkin" on IRC. --- src/doc/trpl/installing-rust.md | 138 ++++++++++++++++++++------------ 1 file changed, 88 insertions(+), 50 deletions(-) diff --git a/src/doc/trpl/installing-rust.md b/src/doc/trpl/installing-rust.md index e4054a097989d..884039f972ba7 100644 --- a/src/doc/trpl/installing-rust.md +++ b/src/doc/trpl/installing-rust.md @@ -1,24 +1,24 @@ % Installing Rust The first step to using Rust is to install it! There are a number of ways to -install Rust, but the easiest is to use the `rustup` script. If you're on 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): +install Rust, but first we ought to go over the officially supported arch's. -```bash -$ curl -sf -L https://static.rust-lang.org/rustup.sh | sudo sh -``` +* Windows (7, 8, Server 2008 R2)*** +* Linux (2.6.18 or later, various distributions), x86 and x86-64 +* OSX 10.7 (Lion) or greater, x86 and x86-64 -If you're concerned about the [potential insecurity][insecurity] 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: +We extensively test Rust on these platforms, there are plans to support Android +in the future, that documentation will be public as it becomes available. -```bash -$ curl -f -L https://static.rust-lang.org/rustup.sh -O -$ sudo sh rustup.sh -``` +***Rust considers Windows to be a first-class platform upon release, but if we're +truly honest, the Windows experience isn't as integrated as the Linux/OS X experience is. +Each and every commit is tested against Windows just like any other platform, if anything +does not work it is a bug. Please let us know if you encounter one we'll squash it for you. -[insecurity]: http://curlpipesh.tumblr.com +Rust also installs a copy of the documentation locally, so you can +read it offline. On UNIX systems, `/usr/local/share/doc/rust` is the location. +On Windows, it's in a `share/doc` directory, inside wherever you installed Rust +to.(Default C:\Program Files\Rust beta 1.0\ ) If you're on Windows, please download either the [32-bit installer][win32] or the [64-bit installer][win64] and run it. @@ -26,48 +26,90 @@ the [64-bit installer][win64] and run it. [win32]: https://static.rust-lang.org/dist/rust-1.0.0-beta-i686-pc-windows-gnu.msi [win64]: https://static.rust-lang.org/dist/rust-1.0.0-beta-x86_64-pc-windows-gnu.msi -## Uninstalling +If you would like to build from source, please check out the +documentation on [building Rust from Source][from source], there is always [the official +binary downloads][install page]as well. + +[from source]: https://github.com/rust-lang/rust#building-from-source +[install page]: http://www.rust-lang.org/install.html + +If you're on Linux or Mac rust has a tool called ['multirust'](https://github.com/brson/multirust/README.md) for managing +Rust, Cargo, and multiple custom toolchains; mappable to any working directory. Multirust is still a work in progress +and is not a part of Rust:master.(Yet) -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 run the uninstall -script: +Rust is signed with a [PGPKey](../trpl/pgp.key)! + +To install 'multirust' from Github first move to your project directory. + +````bash +$ cd /home/$usr/rust/ +``` +Next we'll want to get the sourcecode from Github. + +```bash +$ git clone --recursive https://github.com/brson/multirust +``` + +We will then move to the new mulirust directory. ```bash -$ sudo /usr/local/lib/rustlib/uninstall.sh +$ cd ./rust/multirust ``` +Now we will initialize the submodule + +```bash +$ git submodule update --init +``` + +And finally we will install 'multirust' which will handle the installation of Rust and Cargo! +(This step will require your root password) + +```bash +./build.sh && sudo ./install.sh +``` + +Otherwise if you are working on your own machine and trust the development team. + +Install multiboot via + +```bash +$ sudo curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh +``` +Or Rust proper (minus multirust) + +```bash +$ curl -sf -L https://static.rust-lang.org/rustup.sh | sudo sh +``` + +## Uninstalling + +If you decide you don't want Rust anymore, we'll make sure to keep your seat warm until you get back. + If you used the Windows installer, just re-run the `.msi` and it will give you an uninstall option. -Some people, and somewhat rightfully so, get very upset when we tell you to -`curl | sudo sh`. Basically, when you do this, you are trusting that the good -people who maintain Rust aren't going to hack your computer and do bad things. -That's a good instinct! If you're one of those people, please check out the -documentation on [building Rust from Source][from source], or [the official -binary downloads][install page]. And we promise that this method will not be -the way to install Rust forever: it's just the easiest way to keep people -updated while Rust is in its alpha state. +If you maintain your Rust installation via multirust uninstall is simple. -[from source]: https://github.com/rust-lang/rust#building-from-source -[install page]: http://www.rust-lang.org/install.html +```bash +$ sudo ./install.sh --uninstall +``` -Oh, we should also mention the officially supported platforms: +##Installation test and Upgrade! -* Windows (7, 8, Server 2008 R2) -* Linux (2.6.18 or later, various distributions), x86 and x86-64 -* OSX 10.7 (Lion) or greater, x86 and x86-64 +Upgrading to the latest nightly is easy! -We extensively test Rust on these platforms, and a few others, too, like -Android. But these are the ones most likely to work, as they have the most -testing. +For multirust: +```bash +$ multirust upgrade nightly +``` -Finally, a comment about Windows. Rust considers Windows to be a first-class -platform upon release, but if we're honest, the Windows experience isn't as -integrated as the Linux/OS X experience is. We're working on it! If anything -does not work, it is a bug. Please let us know if that happens. Each and every -commit is tested against Windows just like any other platform. +For source/direct installation upgrades +```bash +$ curl -sf -L https://static.rust-lang.org/rustup.sh | sudo sh +``` -If you've got Rust installed, you can open up a shell, and type this: +To test if installation was successful use: ```bash $ rustc --version @@ -79,20 +121,16 @@ You should see the version number, commit hash, commit date and build date: rustc 1.0.0-beta (9854143cb 2015-04-02) (built 2015-04-02) ``` -If you did, Rust has been installed successfully! Congrats! - -This installer also installs a copy of the documentation locally, so you can -read it offline. On UNIX systems, `/usr/local/share/doc/rust` is the location. -On Windows, it's in a `share/doc` directory, inside wherever you installed Rust -to. +If you did, Rust has been installed successfully! Yay! If not, there are a number of places where you can get help. The easiest is [the #rust IRC channel on irc.mozilla.org][irc], which you can access through [Mibbit][mibbit]. Click that link, and you'll be chatting with other Rustaceans (a silly nickname we call ourselves), and we can help you out. Other great -resources include [the user’s forum][users], and [Stack Overflow][stack -overflow]. +resources include [the user’s forum][users], [Stack Overflow][stackoverflow], +and [Reddit][reddit]. Project specific IRC channels can be found in the reddit sidebar. +[reddit]: http://www.reddit.com/r/rust [irc]: irc://irc.mozilla.org/#rust [mibbit]: http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust [users]: http://users.rust-lang.org/ From 92f9c013c38c33e73fb5ebc442fbf2cf17b34b8e Mon Sep 17 00:00:00 2001 From: rundrop1 Date: Mon, 13 Apr 2015 20:34:44 -0500 Subject: [PATCH 3/6] Update installing-rust.md Added pgp.key to ./src/doc/trpl/pgp.key Added multirust install options, I kept all of the other install methods, they are just moved around and expanded on. Added place holder file for (../doc/trpl/multirust_advsetup.md), I will transfer brsons README.md after I get permission to do so. 5:23(4/13/2015)Lurkin steveklabnik ***PARAPHRASED***Multirust is better than what we have now by a thousand fold.***END_PARAPHRASE*** 5:23(4/13/2015)steveklabnik Lurkin: i asked brson about doing that and he said it wasn't ready for that kind of prime time yet IMHO multirust is a much needed more professional installer. I don't think parts of the first page of the book should be acknowledging the fact that we're asking new users to trust us as literally the first command. I included these instructions but AFTER the windows installation and AFTER the multirust instructions because again in my very humblest of opinions they should be deprecated and never spoken of again. PGP is a plenty fine way to sign the files, we really ought to include a checksum. (Maybe we do) I added the subreddit address to the bottom, I added uninstall files for multirust, I added the default installation file --- src/doc/trpl/installing-rust.md | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/doc/trpl/installing-rust.md b/src/doc/trpl/installing-rust.md index 884039f972ba7..556d6df50b095 100644 --- a/src/doc/trpl/installing-rust.md +++ b/src/doc/trpl/installing-rust.md @@ -50,7 +50,7 @@ Next we'll want to get the sourcecode from Github. $ git clone --recursive https://github.com/brson/multirust ``` -We will then move to the new mulirust directory. +We will then move to the new multirust directory. ```bash $ cd ./rust/multirust @@ -68,10 +68,11 @@ And finally we will install 'multirust' which will handle the installation of Ru ```bash ./build.sh && sudo ./install.sh ``` +See [multirust](../doc/trpl/multirust_advsetup.md) advanced setup for toolchain configuration options and everything you ever wanted to know and more about multirust. Otherwise if you are working on your own machine and trust the development team. -Install multiboot via +Install multirust via ```bash $ sudo curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh @@ -86,8 +87,7 @@ $ curl -sf -L https://static.rust-lang.org/rustup.sh | sudo sh If you decide you don't want Rust anymore, we'll make sure to keep your seat warm until you get back. -If you used the Windows installer, just re-run the `.msi` and it will give you -an uninstall option. +If you used the Windows installer, just re-run the `.msi` and it will give you an uninstall option. If you maintain your Rust installation via multirust uninstall is simple. @@ -100,14 +100,24 @@ $ sudo ./install.sh --uninstall Upgrading to the latest nightly is easy! For multirust: + ```bash $ multirust upgrade nightly ``` +Note: We recommend the beta unless you absolutely need features in the nightly. For source/direct installation upgrades + ```bash +#Hopefully deprecated by launch $ curl -sf -L https://static.rust-lang.org/rustup.sh | sudo sh ``` +If you didn't install multirust and want to get the current nightly. +(Please just get multirust instead of doing this, it will make it way simpler to debug when you can cross compile with different versions of nightlies.) + +```bash +$ curl -sf -L https://static.rustlang.org/rustup.sh | sudo sh -s -- --channel=nightly +``` To test if installation was successful use: From 4ec4c9677a30fc2a60e592deed974d674e0f72cc Mon Sep 17 00:00:00 2001 From: rundrop1 Date: Mon, 13 Apr 2015 20:40:32 -0500 Subject: [PATCH 4/6] Update installing-rust.md Forgot uninstall for non awesome multirust configuration. --- src/doc/trpl/installing-rust.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/doc/trpl/installing-rust.md b/src/doc/trpl/installing-rust.md index 556d6df50b095..02c3ce9c275af 100644 --- a/src/doc/trpl/installing-rust.md +++ b/src/doc/trpl/installing-rust.md @@ -94,6 +94,14 @@ If you maintain your Rust installation via multirust uninstall is simple. ```bash $ sudo ./install.sh --uninstall ``` +Note: If you added additional install options as described on the [multirust](../doc/trpl/multirust_advsetup.md) +page you will want to see that same page for the additional uninstallation options. + +If you did not use multirust the command is + +```bash +$ sudo /usr/local/lib/rustlib/uninstall.sh +``` ##Installation test and Upgrade! From 282f74980fb446f6254edb335a82db415d0e5b3a Mon Sep 17 00:00:00 2001 From: rundrop1 Date: Mon, 13 Apr 2015 20:42:39 -0500 Subject: [PATCH 5/6] Create multirust_advancedsetup.md Placeholderfile --- src/doc/trpl/multirust_advancedsetup.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/doc/trpl/multirust_advancedsetup.md diff --git a/src/doc/trpl/multirust_advancedsetup.md b/src/doc/trpl/multirust_advancedsetup.md new file mode 100644 index 0000000000000..07e68c05c23c9 --- /dev/null +++ b/src/doc/trpl/multirust_advancedsetup.md @@ -0,0 +1 @@ +Placeholder file From f283bebddfa721add7551dee0869d2e88eab600f Mon Sep 17 00:00:00 2001 From: rundrop1 Date: Mon, 13 Apr 2015 20:45:18 -0500 Subject: [PATCH 6/6] Update installing-rust.md Formatting Replaced arch's with "architecture's" in first paragraph. --- src/doc/trpl/installing-rust.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/doc/trpl/installing-rust.md b/src/doc/trpl/installing-rust.md index 02c3ce9c275af..5071b533364a1 100644 --- a/src/doc/trpl/installing-rust.md +++ b/src/doc/trpl/installing-rust.md @@ -1,7 +1,7 @@ % Installing Rust The first step to using Rust is to install it! There are a number of ways to -install Rust, but first we ought to go over the officially supported arch's. +install Rust, but first we ought to go over the officially supported architecture's. * Windows (7, 8, Server 2008 R2)*** * Linux (2.6.18 or later, various distributions), x86 and x86-64 @@ -28,7 +28,7 @@ the [64-bit installer][win64] and run it. If you would like to build from source, please check out the documentation on [building Rust from Source][from source], there is always [the official -binary downloads][install page]as well. +binary downloads][install page] as well. [from source]: https://github.com/rust-lang/rust#building-from-source [install page]: http://www.rust-lang.org/install.html