diff --git a/crates/nu-protocol/src/eval_const.rs b/crates/nu-protocol/src/eval_const.rs index b6506a7151..9abe0a1ea6 100644 --- a/crates/nu-protocol/src/eval_const.rs +++ b/crates/nu-protocol/src/eval_const.rs @@ -265,8 +265,7 @@ pub fn get_vendor_autoload_dirs(_engine_state: &EngineState) -> Vec { // /nushell/vendor/autoload for every dir in XDG_DATA_DIRS in reverse order on platforms other than windows. If XDG_DATA_DIRS is not set, it falls back to /share if PREFIX ends in local, or /local/share:/share otherwise. If PREFIX is not set, fall back to /usr/local/share:/usr/share. // %ProgramData%\nushell\vendor\autoload on windows // NU_VENDOR_AUTOLOAD_DIR from compile time, if env var is set at compile time - // if on macOS, additionally check XDG_DATA_HOME, which `dirs` is only doing on Linux - // /nushell/vendor/autoload of the current user according to the `dirs` crate + // <$nu.data_dir>/vendor/autoload // NU_VENDOR_AUTOLOAD_DIR at runtime, if env var is set let into_autoload_path_fn = |mut path: PathBuf| { @@ -321,23 +320,8 @@ pub fn get_vendor_autoload_dirs(_engine_state: &EngineState) -> Vec { append_fn(PathBuf::from(path)); } - #[cfg(target_os = "macos")] - std::env::var("XDG_DATA_HOME") - .ok() - .map(PathBuf::from) - .or_else(|| { - dirs::home_dir().map(|mut home| { - home.push(".local"); - home.push("share"); - home - }) - }) - .map(into_autoload_path_fn) - .into_iter() - .for_each(&mut append_fn); - - if let Some(data_dir) = dirs::data_dir() { - append_fn(into_autoload_path_fn(data_dir)); + if let Some(data_dir) = nu_path::data_dir() { + append_fn(PathBuf::from(data_dir).join("vendor").join("autoload")); } if let Some(path) = std::env::var_os("NU_VENDOR_AUTOLOAD_DIR") {