Merge pull request #2589 from kinnison/ensure-env-file

Ensure env file exists

Author: kinnison

src/cli/self_update.rs

@@ -338,6 +338,7 @@ pub fn install(
 
     let install_res: Result<utils::ExitCode> = (|| {
         install_bins()?;
+        do_write_env_files()?;
         if !opts.no_modify_path {
             do_add_to_path()?;
         }

src/cli/self_update/env.sh

@@ -5,7 +5,7 @@ case ":${PATH}:" in
     *:"{cargo_bin}":*)
         ;;
     *)
-        # Prepending path in case a system-installed rustc must be overwritten
+        # Prepending path in case a system-installed rustc needs to be overridden
         export PATH="{cargo_bin}:$PATH"
         ;;
 esac

src/cli/self_update/unix.rs

@@ -81,8 +81,6 @@ pub fn do_remove_from_path() -> Result<()> {
 }
 
 pub fn do_add_to_path() -> Result<()> {
-    let mut written = vec![];
-
     for sh in shell::get_available_shells() {
         let source_cmd = sh.source_string()?;
         for rc in sh.update_rcs() {
@@ -92,13 +90,6 @@ pub fn do_add_to_path() -> Result<()> {
                         path: rc.to_path_buf(),
                     }
                 })?;
-                let script = sh.env_script();
-                // Only write scripts once.
-                // TODO 2021: remove this code if Rustup adds 0 shell scripts.
-                if !written.contains(&script) {
-                    script.write()?;
-                    written.push(script);
-                }
             }
         }
     }
@@ -108,6 +99,21 @@ pub fn do_add_to_path() -> Result<()> {
     Ok(())
 }
 
+pub fn do_write_env_files() -> Result<()> {
+    let mut written = vec![];
+
+    for sh in shell::get_available_shells() {
+        let script = sh.env_script();
+        // Only write each possible script once.
+        if !written.contains(&script) {
+            script.write()?;
+            written.push(script);
+        }
+    }
+
+    Ok(())
+}
+
 /// Tell the upgrader to replace the rustup bins, then delete
 /// itself. Like with uninstallation, on Windows we're going to
 /// have to jump through hoops to make everything work right.

src/cli/self_update/windows.rs

@@ -144,6 +144,11 @@ pub fn do_add_to_path() -> Result<()> {
     _apply_new_path(new_path)
 }
 
+// Nothing to do for Windows for now
+pub fn do_write_env_files() -> Result<()> {
+    Ok(())
+}
+
 fn _apply_new_path(new_path: Option<String>) -> Result<()> {
     use std::ptr;
     use winapi::shared::minwindef::*;

tests/cli-inst-interactive.rs

@@ -110,6 +110,7 @@ Rust is installed now. Great!
         );
         if cfg!(unix) {
             assert!(!config.homedir.join(".profile").exists());
+            assert!(config.cargodir.join("env").exists());
         }
     });
 }