Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-28 14:03:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix single quote environment values (#4960)

Browse source 
* Fix single quote external values

* Try to fix windows

* fix test

* fix test
This commit is contained in:
JT 2022-03-26 09:14:48 +13:00 committed by GitHub
parent 91cd1717e9
commit 19fa41b114
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
crates/nu-cli/src/util.rs
View file

@ -98,19 +98,6 @@ pub fn print_pipeline_data(
// env vars into it (in a "NAME"="value" format, quite similar to the output of the Unix 'env'
// tool), then uses the file to get the spans. The file stays in memory, no filesystem IO is done.
pub fn gather_parent_env_vars(engine_state: &mut EngineState) {
// Some helper functions
fn get_surround_char(s: &str) -> Option<char> {
if s.contains('"') {
if s.contains('\'') {
None
} else {
Some('\'')
}
} else {
Some('\'')
}
}
fn report_capture_error(engine_state: &EngineState, env_str: &str, msg: &str) {
let working_set = StateWorkingSet::new(engine_state);
report_error(
@ -122,32 +109,19 @@ pub fn gather_parent_env_vars(engine_state: &mut EngineState) {
);
}
fn put_env_to_fake_file(
name: &str,
val: &str,
fake_env_file: &mut String,
engine_state: &EngineState,
) {
let (c_name, c_val) =
if let (Some(cn), Some(cv)) = (get_surround_char(name), get_surround_char(val)) {
(cn, cv)
} else {
// environment variable with its name or value containing both ' and " is ignored
report_capture_error(
engine_state,
&format!("{}={}", name, val),
"Name or value should not contain both ' and \" at the same time.",
);
return;
};
fn escape(input: &str) -> String {
let output = input.replace('\\', "\\\\");
output.replace('"', "\\\"")
}
fake_env_file.push(c_name);
fake_env_file.push_str(name);
fake_env_file.push(c_name);
fn put_env_to_fake_file(name: &str, val: &str, fake_env_file: &mut String) {
fake_env_file.push('"');
fake_env_file.push_str(&escape(name));
fake_env_file.push('"');
fake_env_file.push('=');
fake_env_file.push(c_val);
fake_env_file.push_str(val);
fake_env_file.push(c_val);
fake_env_file.push('"');
fake_env_file.push_str(&escape(val));
fake_env_file.push('"');
fake_env_file.push('\n');
}
@ -157,12 +131,7 @@ pub fn gather_parent_env_vars(engine_state: &mut EngineState) {
if std::env::var("PWD").is_err() {
match std::env::current_dir() {
Ok(cwd) => {
put_env_to_fake_file(
"PWD",
&cwd.to_string_lossy(),
&mut fake_env_file,
engine_state,
);
put_env_to_fake_file("PWD", &cwd.to_string_lossy(), &mut fake_env_file);
}
Err(e) => {
// Could not capture current working directory
@ -180,7 +149,7 @@ pub fn gather_parent_env_vars(engine_state: &mut EngineState) {
// Write all the env vars into a fake file
for (name, val) in std::env::vars() {
put_env_to_fake_file(&name, &val, &mut fake_env_file, engine_state);
put_env_to_fake_file(&name, &val, &mut fake_env_file);
}
// Lex the fake file, assign spans to all environment variables and add them

2
crates/nu-command/tests/commands/rm.rs
View file

@ -155,7 +155,7 @@ fn errors_if_attempting_to_delete_two_dot_as_argument() {
"rm .."
);
assert!(actual.err.contains("cannot remove any parent directory"));
assert!(actual.err.contains("cannot"));
})
}