Re-use DEFAULT_PATH in setup_path

- No need to hard-code a different default
fish-shell · Aug 20, 2023 · a5f4a4c · a5f4a4c
1 parent 3205278
commit a5f4a4c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/fish-rust/src/env/environment.rs b/fish-rust/src/env/environment.rs
@@ -512,7 +512,7 @@ fn setup_path() {
             str2wcstring(cstr.to_bytes())
         } else {
             // the above should really not fail
-            L!("/usr/bin:/bin").to_owned()
+            join_strings(crate::path::DEFAULT_PATH.as_ref(), ':')
         };
 
         vars.set_one(L!("PATH"), EnvMode::GLOBAL | EnvMode::EXPORT, path);

diff --git a/fish-rust/src/path.rs b/fish-rust/src/path.rs
@@ -185,7 +185,7 @@ pub fn path_get_path(cmd: &wstr, vars: &dyn Environment) -> Option<WString> {
 
 // PREFIX is defined at build time.
 #[widestrs]
-static DEFAULT_PATH: Lazy<[WString; 3]> = Lazy::new(|| {
+pub static DEFAULT_PATH: Lazy<[WString; 3]> = Lazy::new(|| {
     [
         "/bin"L.to_owned(),
         "/usr/bin"L.to_owned(),