The great renaming

Author: Kha

Cargo.lock

@@ -1,18 +1,10 @@
 [package]
 
-name = "rustup"
-version = "1.11.0"
-authors = [ "Diggory Blake <[email protected]>" ]
+name = "elan"
+version = "0.1.0"
+authors = [ "Sebastian Ullrich <[email protected]>" ]
 description = "Manage multiple rust installations with ease"
 
-documentation = "http://rust-lang-nursery.github.io/rustup.rs/rustup/index.html"
-homepage = "https://github.com/rust-lang-nursery/rustup.rs"
-repository = "https://github.com/rust-lang-nursery/rustup.rs"
-
-readme = "README.md"
-
-keywords = ["rustup", "multirust", "install", "proxy"]
-
 license = "MIT OR Apache-2.0"
 
 build = "build.rs"
@@ -31,8 +23,8 @@ no-self-update = []
 msi-installed = []
 
 [dependencies]
-rustup-dist = { path = "src/rustup-dist" }
-rustup-utils = { path = "src/rustup-utils" }
+elan-dist = { path = "src/elan-dist" }
+elan-utils = { path = "src/elan-utils" }
 download = { path = "src/download" }
 clap = "2.18.0"
 error-chain = "0.11"
@@ -61,19 +53,15 @@ winapi = { version = "0.3", features = ["jobapi", "jobapi2", "processthreadsapi"
 winreg = "0.5.0"
 gcc = "0.3.50"
 
-[dev-dependencies]
-rustup-mock = { path = "src/rustup-mock", version = "1.1.0" }
-lazy_static = "1.0.0"
-
 [workspace]
-members = ["src/rustup-win-installer"]
+members = ["src/elan-win-installer"]
 
 [lib]
-name = "rustup"
-path = "src/rustup/lib.rs"
+name = "elan"
+path = "src/elan/lib.rs"
 test = false # no unit tests
 
 [[bin]]
-name = "rustup-init"
-path = "src/rustup-cli/main.rs"
+name = "elan-init"
+path = "src/elan-cli/main.rs"
 test = false # no unit tests

Cargo.toml

@@ -1,4 +1,5 @@
 Copyright (c) 2016 The Rust Project Developers
+Modifications copyright (c) 2018 Sebastian Ullrich
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated

LICENSE-MIT

@@ -0,0 +1,52 @@
+use std::env;
+use std::error::Error;
+use std::fs::File;
+use std::io::Write;
+use std::path::PathBuf;
+use std::process::Command;
+
+struct Ignore;
+
+impl<E> From<E> for Ignore
+    where E: Error
+{
+    fn from(_: E) -> Ignore {
+        Ignore
+    }
+}
+
+fn main() {
+    let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());
+
+    File::create(out_dir.join("commit-info.txt"))
+        .unwrap()
+        .write_all(commit_info().as_bytes())
+        .unwrap();
+    println!("cargo:rerun-if-changed=build.rs");
+}
+
+// Try to get hash and date of the last commit on a best effort basis. If anything goes wrong
+// (git not installed or if this is not a git repository) just return an empty string.
+fn commit_info() -> String {
+    match (commit_hash(), commit_date()) {
+        (Ok(hash), Ok(date)) => format!(" ({} {})", hash.trim_right(), date),
+        _ => String::new(),
+    }
+}
+
+fn commit_hash() -> Result<String, Ignore> {
+    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)))
+}

build.rs

@@ -10,21 +10,21 @@
 # except according to those terms.
 
 # This is just a little script that can be downloaded from the internet to
-# install rustup. It just does platform detection, downloads the installer
+# install elan. It just does platform detection, downloads the installer
 # and runs it.
 
 set -u
 
-RUSTUP_UPDATE_ROOT="https://static.rust-lang.org/rustup/dist"
+ELAN_UPDATE_ROOT="https://static.lean-lang.org/elan/dist"
 
 #XXX: If you change anything here, please make the same changes in setup_mode.rs
 usage() {
     cat 1>&2 <<EOF
-rustup-init 1.0.0 (408ed84 2017-02-11)
-The installer for rustup
+elan-init 1.0.0 (408ed84 2017-02-11)
+The installer for elan
 
 USAGE:
-    rustup-init [FLAGS] [OPTIONS]
+    elan-init [FLAGS] [OPTIONS]
 
 FLAGS:
     -v, --verbose           Enable verbose output
@@ -60,10 +60,10 @@ main() {
             ;;
     esac
 
-    local _url="$RUSTUP_UPDATE_ROOT/$_arch/rustup-init$_ext"
+    local _url="$ELAN_UPDATE_ROOT/$_arch/elan-init$_ext"
 
-    local _dir="$(mktemp -d 2>/dev/null || ensure mktemp -d -t rustup)"
-    local _file="$_dir/rustup-init$_ext"
+    local _dir="$(mktemp -d 2>/dev/null || ensure mktemp -d -t elan)"
+    local _file="$_dir/elan-init$_ext"
 
     local _ansi_escapes_are_valid=false
     if [ -t 2 ]; then
@@ -104,7 +104,7 @@ main() {
     ensure chmod u+x "$_file"
     if [ ! -x "$_file" ]; then
         printf '%s\n' "Cannot execute $_file (likely because of mounting /tmp as noexec)." 1>&2
-        printf '%s\n' "Please copy the file to a location where you can execute binaries and run ./rustup-init$_ext." 1>&2
+        printf '%s\n' "Please copy the file to a location where you can execute binaries and run ./elan-init$_ext." 1>&2
         exit 1
     fi
 
@@ -306,7 +306,7 @@ get_architecture() {
         fi
     fi
 
-    # Detect armv7 but without the CPU features Rust needs in that build,
+    # Detect armv7 but without the CPU features Lean needs in that build,
     # and fall back to arm.
     # See https://github.com/rust-lang-nursery/rustup.rs/issues/587.
     if [ $_ostype = "unknown-linux-gnueabihf" -a $_cputype = armv7 ]; then
@@ -322,7 +322,7 @@ get_architecture() {
 }
 
 say() {
-    echo "rustup: $1"
+    echo "elan: $1"
 }
 
 err() {

elan-init.sh

@@ -332,7 +332,7 @@ pub mod reqwest_be {
             let src = try!(url.to_file_path()
                            .map_err(|_| Error::from(format!("bogus file url: '{}'", url))));
             if !src.is_file() {
-                // Because some of rustup's logic depends on checking
+                // Because some of elan's logic depends on checking
                 // the error when a downloaded file doesn't exist, make
                 // the file case return the same error value as the
                 // network case.