holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change NU_LIB_DIRS not to depend on $nu.config-path (#8887)

Browse Source
This commit is contained in:
goldfish
2023-04-15 05:16:00 +09:00
committed by GitHub
parent 9b35d59023
commit 45d33e70db
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crates/nu-engine/src/nu_variable.rs
View File

@ -25,7 +25,13 @@ pub struct NuVariable {
impl LazyRecord for NuVariable {
fn column_names(&self) -> Vec<&'static str> {
let mut cols = vec!["config-path", "env-path", "history-path", "loginshell-path"];
let mut cols = vec![
"default-config-dir",
"config-path",
"env-path",
"history-path",
"loginshell-path",
];
#[cfg(feature = "plugin")]
if self.engine_state.plugin_signatures.is_some() {
@ -70,6 +76,17 @@ impl LazyRecord for NuVariable {
}
match column {
"default-config-dir" => {
if let Some(mut path) = nu_path::config_dir() {
path.push("nushell");
Ok(Value::String {
val: path.to_string_lossy().to_string(),
span: self.span,
})
} else {
err("Could not get config directory")
}
}
"config-path" => {
if let Some(path) = self.engine_state.get_config_path("config-path") {
let canon_config_path = canonicalize_path(&self.engine_state, path);