Merge branch 'master' into rustup-from-non-existing-path

Author: Diggsey

.gitignore

@@ -2,5 +2,6 @@
 /target
 /Cargo.lock
 /.settings
+/.idea/
 *~
 /**/target

.travis.yml

@@ -156,9 +156,3 @@ deploy:
       secure: "fcKM0bWHz1UJVnZdQl/kCrFCykDkdwOAy1o5LAsUEkgNwSiWF4qC2sqHUbz2hCIe2tD5D8UCqa7brgSz0HNTL1yvSeOO/0Vim8xP9ev9SMf0Muekq0Wj/Kw4kJ3C4ajHdOdF2zXGnw9tsitzylLqx/r8cu0S8UtI49sIAWF3+/dD/uGnXu+wtaYiUJ1znirDzq74rHLrk8M/kQDFTrDJ8D+wXbKSJP9nmKkFShkW8A71QmaCOUqG3q7SpylY81rKRjHjtXCWJ3CHkD7XpdxdsImnukDtt8OndJH+9691TPKcR/RUC/dnUYg5QignmV83AN84c2/6ZykarQ9M/ziBYRI92bj0vPhoHu/vk2HY1VgWlX9qbXfVzd8glfmtS6be7eNYPtEHxoSu9o6WSbVaFv/07IapY/f7vE0kflvW58hRjdy8k4Sv31qPFO0hs7NFJMCRCam/uPpWKTEhfIjAJH6PoXOvND92ZHi9rjnwfVtXEClYtl5vPkRgPTkKJXzF+jVl9sDX1WhZhfgqRNNWEVyfoiptNxHygavDGCPsjpKVMmvntM8dsMZmewSeKemratN2seTP5q4d/IVbgONXiH/SDFhzXkIy4W/MdbxEjXBaVW0DT7x5k/CZhx1ZBIquWhE52nZWpBsJdpCiWl9AORDYVQnCjNp8hWXX7TlIBe4="
     on:
       branch: stable
-
-# FIXME: I don't know if this really works
-after_deploy:
-  - sudo pip install awscli
-  - aws configure set preview.cloudfront true
-  - aws cloudfront create-invalidation --paths "rustup/$TARGET/* rustup/dev/$TARGET/* rustup/www/* rustup/dev/www/* rustup/* rustup/dev/*"

README.md

@@ -500,6 +500,12 @@ If you need a more complex setup, rustup supports the convention used by
 the __curl__ program, documented in the ENVIRONMENT section of
 [its manual page][curlman].
 
+Note that some versions of `libcurl` apparently require you to drop the 
+`http://` or `https://` prefix in environment variables. For example, 
+`export http_proxy=proxy.example.com:1080` (and likewise for HTTPS). 
+If you are getting an SSL `unknown protocol` error from `rustup` via `libcurl`
+but the command-line `curl` command works fine, this may be the problem.
+
 [curlman]: https://curl.haxx.se/docs/manpage.html
 
 

build.rs

@@ -8,7 +8,8 @@ use std::process::Command;
 struct Ignore;
 
 impl<E> From<E> for Ignore
-    where E: Error
+where
+    E: Error,
 {
     fn from(_: E) -> Ignore {
         Ignore
@@ -35,18 +36,21 @@ fn commit_info() -> String {
 }
 
 fn commit_hash() -> Result<String, Ignore> {
-    Ok(try!(String::from_utf8(try!(Command::new("git")
-                                       .args(&["rev-parse", "--short=9", "HEAD"])
-                                       .output())
-                                  .stdout)))
+    Ok(try!(String::from_utf8(
+        try!(
+            Command::new("git")
+                .args(&["rev-parse", "--short=9", "HEAD"])
+                .output()
+        ).stdout
+    )))
 }
 
 fn commit_date() -> Result<String, Ignore> {
-    Ok(try!(String::from_utf8(try!(Command::new("git")
-                                       .args(&["log",
-                                               "-1",
-                                               "--date=short",
-                                               "--pretty=format:%cd"])
-                                       .output())
-                                  .stdout)))
+    Ok(try!(String::from_utf8(
+        try!(
+            Command::new("git")
+                .args(&["log", "-1", "--date=short", "--pretty=format:%cd"])
+                .output()
+        ).stdout
+    )))
 }

ci/sync-dist.py

@@ -89,15 +89,15 @@ def usage():
     if os.path.exists("local-rustup/dist"):
         shutil.rmtree("local-rustup/dist")
     os.makedirs("local-rustup/dist")
-    s3cmd = "s3cmd sync s3://{}/rustup/dist/ ./local-rustup/dist/".format(s3_bucket)
+    s3cmd = "aws s3 cp --recursive s3://{}/rustup/dist/ ./local-rustup/dist/".format(s3_bucket)
 elif command == "local-to-dev-archives" \
      or command == "local-to-prod-archives":
-    s3cmd = "s3cmd sync ./local-rustup/dist/ s3://{}/rustup/archive/{}/".format(s3_bucket, archive_version)
+    s3cmd = "aws s3 cp --recursive ./local-rustup/dist/ s3://{}/rustup/archive/{}/".format(s3_bucket, archive_version)
 elif command == "local-to-prod":
-    s3cmd = "s3cmd sync ./local-rustup/dist/ s3://{}/rustup/dist/".format(s3_bucket)
+    s3cmd = "aws s3 cp --recursive local-rustup/dist/ s3://{}/rustup/dist/".format(s3_bucket)
 elif command == "update-dev-release" \
      or command == "update-prod-release":
-    s3cmd = "s3cmd put ./local-rustup/release-stable.toml s3://{}/rustup/release-stable.toml".format(s3_bucket)
+    s3cmd = "aws s3 cp ./local-rustup/release-stable.toml s3://{}/rustup/release-stable.toml".format(s3_bucket)
 else:
     sys.exit(1)
 
@@ -115,11 +115,13 @@ def run_s3cmd(command):
     s3cmd = command.split(" ")
 
     if not live_run:
-        s3cmd += ["--dry-run"]
+        s3cmd += ["--dryrun"]
 
     # These are old installer names for compatibility. They don't need to
     # be touched ever again.
-    s3cmd += ["--exclude=*rustup-setup*"]
+    if "cloudfront" not in command:
+        s3cmd += ["--exclude=*rustup-setup*"]
+    print('executing: ', s3cmd);
 
     subprocess.check_call(s3cmd)
 
@@ -130,16 +132,30 @@ def run_s3cmd(command):
 if command == "dev-to-local":
     if os.path.exists("local-rustup/rustup-init.sh"):
         os.remove("local-rustup/rustup-init.sh")
-    run_s3cmd("s3cmd get s3://{}/rustup/rustup-init.sh ./local-rustup/rustup-init.sh"
+    run_s3cmd("aws s3 cp s3://{}/rustup/rustup-init.sh ./local-rustup/rustup-init.sh"
               .format(s3_bucket))
     if os.path.exists("local-rustup/www"):
         shutil.rmtree("local-rustup/www")
     os.makedirs("local-rustup/www")
-    run_s3cmd("s3cmd sync s3://{}/rustup/www/ ./local-rustup/www/"
+    run_s3cmd("aws s3 cp --recursive s3://{}/rustup/www/ ./local-rustup/www/"
               .format(s3_bucket))
 
 if command == "local-to-prod":
-    run_s3cmd("s3cmd put ./local-rustup/rustup-init.sh s3://{}/rustup/rustup-init.sh"
+    run_s3cmd("aws s3 cp ./local-rustup/rustup-init.sh s3://{}/rustup/rustup-init.sh"
               .format(s3_bucket))
-    run_s3cmd("s3cmd sync ./local-rustup/www/ s3://{}/rustup/www/"
+    run_s3cmd("aws s3 cp --recursive ./local-rustup/www/ s3://{}/rustup/www/"
               .format(s3_bucket))
+    if live_run:
+        # Invalidate sh.rustup.rs
+        run_s3cmd("aws cloudfront create-invalidation --distribution-id " +
+                  "E70E9RGZ6Q27W --paths /*".format(s3_bucket))
+        # Invalidate win.rustup.rs
+        run_s3cmd("aws cloudfront create-invalidation --distribution-id " +
+                  "E2XBMULPACBLNE --paths /*".format(s3_bucket))
+        # Invalidate rustup.rs
+        run_s3cmd("aws cloudfront create-invalidation --distribution-id " +
+                  "EVJCMYBQ0EX26 --paths /*".format(s3_bucket))
+
+if command == "update-dev-release" and live_run:
+    run_s3cmd("aws cloudfront create-invalidation --distribution-id " +
+              "E30AO2GXMDY230 --paths /rustup/*".format(s3_bucket))

rustup-init.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Copyright 2016 The Rust Project Developers. See the COPYRIGHT
 # file at the top-level directory of this distribution and at
 # http://rust-lang.org/COPYRIGHT.
@@ -9,8 +9,8 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-# This is just a little script that can be curled from the internet to
-# install rustup. It just does platform detection, curls the installer
+# This is just a little script that can be downloaded from the internet to
+# install rustup. It just does platform detection, downloads the installer
 # and runs it.
 
 set -u
@@ -41,8 +41,8 @@ EOF
 }
 
 main() {
+    downloader --check
     need_cmd uname
-    need_cmd curl
     need_cmd mktemp
     need_cmd chmod
     need_cmd mkdir
@@ -100,7 +100,7 @@ main() {
     fi
 
     ensure mkdir -p "$_dir"
-    ensure curl -sSfL "$_url" -o "$_file"
+    ensure downloader "$_url" "$_file"
     ensure chmod u+x "$_file"
     if [ ! -x "$_file" ]; then
         printf '%s\n' "Cannot execute $_file (likely because of mounting /tmp as noexec)." 1>&2
@@ -331,11 +331,16 @@ err() {
 }
 
 need_cmd() {
-    if ! command -v "$1" > /dev/null 2>&1
+    if ! check_cmd "$1"
     then err "need '$1' (command not found)"
     fi
 }
 
+check_cmd() {
+    command -v "$1" > /dev/null 2>&1
+    return $?
+}
+
 need_ok() {
     if [ $? != 0 ]; then err "$1"; fi
 }
@@ -359,4 +364,24 @@ ignore() {
     "$@"
 }
 
+# This wraps curl or wget. Try curl first, if not installed,
+# use wget instead.
+downloader() {
+    if check_cmd curl
+    then _dld=curl
+    elif check_cmd wget
+    then _dld=wget
+    else _dld='curl or wget' # to be used in error message of need_cmd
+    fi
+
+    if [ "$1" = --check ]
+    then need_cmd "$_dld"
+    elif [ "$_dld" = curl ]
+    then curl -sSfL "$1" -o "$2"
+    elif [ "$_dld" = wget ]
+    then wget "$1" -O "$2"
+    else err "Unknown downloader"   # should not reach here
+    fi
+}
+
 main "$@" || exit 1

src/download/src/errors.rs

@@ -1,5 +1,3 @@
-
-
 error_chain! {
     links { }