Write a custom env script for fish

rust-lang · Oct 9, 2023 · 0cc274e · 0cc274e
1 parent 6838d76
commit 0cc274e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/cli/self_update/env.fish b/src/cli/self_update/env.fish
@@ -0,0 +1,5 @@
+# rustup shell setup
+if not contains "{cargo_bin}" $PATH
+    # Prepending path in case a system-installed rustc needs to be overridden
+    set -x PATH "{cargo_bin}" $PATH
+end
diff --git a/src/cli/self_update/shell.rs b/src/cli/self_update/shell.rs
@@ -235,6 +235,17 @@ impl UnixShell for Fish {
     fn update_rcs(&self) -> Vec<PathBuf> {
         self.rcfiles()
     }
+
+    fn env_script(&self) -> ShellScript {
+        ShellScript {
+            name: "env.fish",
+            content: include_str!("env.fish"),
+        }
+    }
+
+    fn source_string(&self) -> Result<String> {
+        Ok(format!(r#". "{}/env.fish""#, cargo_home_str()?))
+    }
 }
 
 pub(crate) fn legacy_paths() -> impl Iterator<Item = PathBuf> {