Read env.sh locally but write env

rust-lang · Jul 21, 2020 · a66e4e1 · a66e4e1
1 parent 9488dac
commit a66e4e1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/cli/self_update.rs b/src/cli/self_update.rs
@@ -161,7 +161,7 @@ To get started you need Cargo's bin directory ({cargo_home}/bin) in your `PATH`
 environment variable. Next time you log in this will be done
 automatically.
 
-To configure your current shell run `source {cargo_home}/env.sh`
+To configure your current shell run `source {cargo_home}/env`
 "
     };
 }
@@ -184,7 +184,7 @@ macro_rules! post_install_msg_unix_no_modify_path {
 To get started you need Cargo's bin directory ({cargo_home}/bin) in your `PATH`
 environment variable.
 
-To configure your current shell run `source {cargo_home}/env.sh`
+To configure your current shell run `source {cargo_home}/env`
 "
     };
 }

diff --git a/src/cli/self_update/shell.rs b/src/cli/self_update/shell.rs
@@ -92,13 +92,13 @@ pub trait UnixShell {
     // Writes the relevant env file.
     fn env_script(&self) -> ShellScript {
         ShellScript {
-            name: "env.sh",
+            name: "env",
             content: include_str!("env.sh"),
         }
     }
 
     fn source_string(&self) -> Result<String> {
-        Ok(format!(r#"source "{}/env.sh""#, cargo_home_str()?))
+        Ok(format!(r#"source "{}/env""#, cargo_home_str()?))
     }
 }
 

diff --git a/tests/cli-paths.rs b/tests/cli-paths.rs
@@ -29,7 +29,7 @@ source ~/fruit/punch
 export PATH="$HOME/apple/bin"
 "#;
     const DEFAULT_EXPORT: &str = "export PATH=\"$HOME/.cargo/bin:$PATH\"\n";
-    const POSIX_SH: &str = "env.sh";
+    const POSIX_SH: &str = "env";
 
     fn source(dir: impl Display, sh: impl Display) -> String {
         format!("source \"{dir}/{sh}\"\n", dir = dir, sh = sh)
@@ -49,7 +49,7 @@ export PATH="$HOME/apple/bin"
             // otherwise the literal path will be written to the file.
 
             let mut cmd = clitools::cmd(config, "rustup-init", &INIT_NONE[1..]);
-            let files: Vec<PathBuf> = [".cargo/env.sh", ".profile", ".zshenv"]
+            let files: Vec<PathBuf> = [".cargo/env", ".profile", ".zshenv"]
                 .iter()
                 .map(|file| config.homedir.join(file))
                 .collect();
@@ -282,7 +282,7 @@ export PATH="$HOME/apple/bin"
             assert!(cmd.output().unwrap().status.success());
 
             let new_profile = fs::read_to_string(&profile).unwrap();
-            let expected = format!("{}source \"$HOME/.cargo/env.sh\"\n", FAKE_RC);
+            let expected = format!("{}source \"$HOME/.cargo/env\"\n", FAKE_RC);
             assert_eq!(new_profile, expected);
 
             let mut cmd = clitools::cmd(config, "rustup", &["self", "uninstall", "-y"]);