Custom and interactive install

src/rustup-cli/common.rs

@@ -29,6 +29,61 @@ pub fn confirm(question: &str, default: bool) -> Result<bool> {
     Ok(r)
 }
 
+pub enum Confirm {
+    Yes, No, Advanced
+}
+
+pub fn confirm_advanced(default: Confirm) -> Result<Confirm> {
+    let _ = std::io::stdout().flush();
+    let input = try!(read_line());
+
+    let r = match &*input {
+        "y" | "Y" | "yes" => Confirm::Yes,
+        "n" | "N" | "no" => Confirm::No,
+        "a" | "A" | "advanced" => Confirm::Advanced,
+        "" => default,
+        _ => Confirm::No,
+    };
+
+    println!("");
+
+    Ok(r)
+}
+
+pub fn question_str(question: &str, default: &str) -> Result<String> {
+    println!("{}", question);
+    let _ = std::io::stdout().flush();
+    let input = try!(read_line());
+
+    println!("");
+
+    if input.is_empty() {
+        Ok(default.to_string())
+    } else {
+        Ok(input)
+    }
+}
+
+pub fn question_bool(question: &str, default: bool) -> Result<bool> {
+    println!("{}", question);
+
+    let _ = std::io::stdout().flush();
+    let input = try!(read_line());
+
+    println!("");
+
+    if input.is_empty() {
+        Ok(default)
+    } else {
+        match &*input {
+            "y" | "Y" | "yes" => Ok(true),
+            "n" | "N" | "no" => Ok(false),
+            _ => Ok(default)
+        }
+    }
+
+}
+
 pub fn read_line() -> Result<String> {
     let stdin = std::io::stdin();
     let stdin = stdin.lock();

src/rustup-cli/main.rs

@@ -96,10 +96,14 @@ fn run_multirust() -> Result<()> {
             // ~/.multirust/tmp/multirust-$random, and execute it with
             // `self install` as the arguments.  FIXME: Verify this
             // works.
+            let opts = self_update::InstallOpts {
+                default_toolchain: "stable".to_string(),
+                no_modify_path: false,
+            };
             if cfg!(windows) {
-                self_update::install(false, false, "stable")
+                self_update::install(false, false, opts)
             } else {
-                self_update::install(true, false, "stable")
+                self_update::install(true, false, opts)
             }
         }
         Some(_) => {