Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2025-01-27 20:35:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Only add quotes if not in Windows (which adds its own?) (#1374)

Browse source 
* Only add quotes if not in Windows (which adds its own?)

* Only add quotes if not in Windows (which adds its own?)
This commit is contained in:
Jonathan Turner 2020-02-10 23:07:44 -08:00 committed by GitHub
parent 6a371802b4
commit 0b2be52bb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/commands/classified/external.rs
View file

@ -104,14 +104,17 @@ async fn run_with_iterator_arg(
} else { } else {
let arg = if arg.is_it() { let arg = if arg.is_it() {
let value = it_replacement.to_owned(); let value = it_replacement.to_owned();
let value = expand_tilde(&value, || home_dir.as_ref()).as_ref().to_string(); let mut value = expand_tilde(&value, || home_dir.as_ref()).as_ref().to_string();
let value = { #[cfg(not(windows))]
if argument_contains_whitespace(&value) && !argument_is_quoted(&value) { {
add_quotes(&value) value = {
} else { if argument_contains_whitespace(&value) && !argument_is_quoted(&value) {
value add_quotes(&value)
} } else {
}; value
}
};
}
value value
} else { } else {
arg.to_string() arg.to_string()
@ -370,6 +373,7 @@ where
shellexpand::tilde_with_context(input, home_dir) shellexpand::tilde_with_context(input, home_dir)
} }
#[allow(unused)]
pub fn argument_contains_whitespace(argument: &str) -> bool { pub fn argument_contains_whitespace(argument: &str) -> bool {
argument.chars().any(|c| c.is_whitespace()) argument.chars().any(|c| c.is_whitespace())
} }
@ -379,12 +383,13 @@ fn argument_is_quoted(argument: &str) -> bool {
return false; return false;
} }
(argument.starts_with('"') && argument.ends_with('"') ((argument.starts_with('"') && argument.ends_with('"'))
|| (argument.starts_with('\'') && argument.ends_with('\''))) || (argument.starts_with('\'') && argument.ends_with('\'')))
} }
#[allow(unused)]
fn add_quotes(argument: &str) -> String { fn add_quotes(argument: &str) -> String {
format!("'{}'", argument) format!("\"{}\"", argument)
} }
fn remove_quotes(argument: &str) -> Option<&str> { fn remove_quotes(argument: &str) -> Option<&str> {
@ -505,8 +510,8 @@ mod tests {
#[test] #[test]
fn adds_quotes_to_argument_to_be_passed_in() { fn adds_quotes_to_argument_to_be_passed_in() {
assert_eq!(add_quotes("andrés"), "'andrés'"); assert_eq!(add_quotes("andrés"), "\"andrés\"");
assert_eq!(add_quotes("'andrés'"), "''andrés''"); //assert_eq!(add_quotes("\"andrés\""), "\"andrés\"");
} }
#[test] #[test]