Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2025-01-26 03:45:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Remove no-longer-needed convert_env_values calls (#14681)"

Browse source 
This reverts commit 0d3f76ddef.
This commit is contained in:
Darren Schroeder 2025-01-05 21:52:21 -06:00 committed by GitHub
parent b60f91f722
commit 11389cded2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 36 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/nu-cli/src/repl.rs
View file

@ -19,7 +19,7 @@ use miette::{ErrReport, IntoDiagnostic, Result};
use nu_cmd_base::util::get_editor;
use nu_color_config::StyleComputer;
#[allow(deprecated)]
use nu_engine::{current_dir_str, env_to_strings};
use nu_engine::{convert_env_values, current_dir_str, env_to_strings};
use nu_parser::{lex, parse, trim_quotes_str};
use nu_protocol::{
config::NuCursorShape,
@ -79,6 +79,13 @@ pub fn evaluate_repl(
stack.clone(),
);
let start_time = std::time::Instant::now();
// Translate environment variables from Strings to Values
if let Err(e) = convert_env_values(engine_state, &unique_stack) {
report_shell_error(engine_state, &e);
}
perf!("translate env vars", start_time, use_color);
// seed env vars
unique_stack.add_env_var(
"CMD_DURATION_MS".into(),

17
crates/nu-engine/src/env.rs
View file

@ -89,7 +89,22 @@ pub fn convert_env_values(engine_state: &mut EngineState, stack: &Stack) -> Resu
}
}
error = error.or_else(|| ensure_path(&mut new_scope, "PATH"));
#[cfg(not(windows))]
{
error = error.or_else(|| ensure_path(&mut new_scope, "PATH"));
}
#[cfg(windows)]
{
let first_result = ensure_path(&mut new_scope, "Path");
if first_result.is_some() {
let second_result = ensure_path(&mut new_scope, "PATH");
if second_result.is_some() {
error = error.or(first_result);
}
}
}
if let Ok(last_overlay_name) = &stack.last_overlay_name() {
if let Some(env_vars) = Arc::make_mut(&mut engine_state.env_vars).get_mut(last_overlay_name)

12
src/config_files.rs
View file

@ -52,6 +52,18 @@ pub(crate) fn read_config_file(
use_color
);
} else {
let start_time = std::time::Instant::now();
let config = engine_state.get_config();
let use_color = config.use_ansi_coloring.get(engine_state);
if let Err(e) = convert_env_values(engine_state, stack) {
report_shell_error(engine_state, &e);
}
perf!(
"translate env vars before default_config.nu",
start_time,
use_color
);
eval_default_config(engine_state, stack, get_default_config(), is_env_config);
};