Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix retrieval of config directory for user autoloads #14877

Merged
merged 1 commit into from
Jan 20, 2025
Merged

Fix retrieval of config directory for user autoloads #14877

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions crates/nu-protocol/src/eval_const.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,12 +350,6 @@ pub fn get_vendor_autoload_dirs(_engine_state: &EngineState) -> Vec<PathBuf> {
pub fn get_user_autoload_dirs(_engine_state: &EngineState) -> Vec<PathBuf> {
// User autoload directories - Currently just `autoload` in the default
// configuration directory
let into_autoload_path_fn = |mut path: PathBuf| {
path.push("nushell");
path.push("autoload");
path
};

let mut dirs = Vec::new();

let mut append_fn = |path: PathBuf| {
Expand All @@ -364,8 +358,8 @@ pub fn get_user_autoload_dirs(_engine_state: &EngineState) -> Vec<PathBuf> {
}
};

if let Some(config_dir) = dirs::config_dir() {
append_fn(into_autoload_path_fn(config_dir));
if let Some(config_dir) = nu_path::nu_config_dir() {
append_fn(config_dir.join("autoload").into());
}

dirs
Expand Down
Loading