Skip to content

Move rustup to the combined installer #20452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jan 5, 2015
Merged

Move rustup to the combined installer #20452

merged 11 commits into from
Jan 5, 2015

Conversation

brson
Copy link
Contributor

@brson brson commented Jan 3, 2015

This changes rustup to use the combined installer instead of downloading both rust and cargo. Temporarily it loses the ability to not install cargo, but sometime soon I'll upgrade rust-installer to support selecting components.

It also disables verbose tarball extraction because it is very noisy with the volume of docs.

Supersedes #19927

I've already uploaded to s3.

@rust-highfive
Copy link
Contributor

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@brson
Copy link
Contributor Author

brson commented Jan 3, 2015

@erickt The ability to pull from the archives will be temporarily broken during the transition to the combined installer because it has a different name.

@erickt
Copy link
Contributor

erickt commented Jan 3, 2015

@brson: no worries! it'll be way better to have this landed :)

@SiegeLord
Copy link
Contributor

Just FYI, I tried the combined nightly (gotten from https://static.rust-lang.org/dist/rust-combined-nightly-x86_64-unknown-linux-gnu.tar.gz ) and it installed the HTML documentation in a directory that was not world-readable.

@nikomatsakis
Copy link
Contributor

Tidy failure: line exceeds 100 characters.

@brson
Copy link
Contributor Author

brson commented Jan 3, 2015

@SiegeLord presumably that directory was /usr/local/share/doc/rust? What's the documentation directory on your system, and what system is it?

@SiegeLord
Copy link
Contributor

@brson No, it was the /usr/local/share/doc/rust/html. This was Linux.

$ ls -l /usr/local/share/doc/rust/
-rw-r--r--  1 root root 17426 Jan  3 09:47 COPYRIGHT
drwx------ 29 root root  4096 Jan  3 09:48 html
-rw-r--r--  1 root root 10847 Jan  3 09:47 LICENSE-APACHE
-rw-r--r--  1 root root  1071 Jan  3 09:47 LICENSE-MIT
-rw-r--r--  1 root root  4077 Jan  3 09:47 README.md

@brson
Copy link
Contributor Author

brson commented Jan 3, 2015

@SeigeLord perhaps the problem is that the installer is installing the docs using 'cp' instead of 'install', so the files end up with the wrong permissions.

@brson
Copy link
Contributor Author

brson commented Jan 3, 2015

@SiegeLord I see the same permissions problem here. I only tested in by listing the directory, not actually reading the files. Thanks for bringing it to my attention.

bors added a commit that referenced this pull request Jan 4, 2015
Move rustup to the combined installer

Reviewed-by: brson
bors added a commit that referenced this pull request Jan 4, 2015
Move rustup to the combined installer

Reviewed-by: brson
@bors bors merged commit ebdf331 into rust-lang:master Jan 5, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants