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

don't join paths to cwd ever in calls to external functions (#5180)

Browse Source 
This is a follow-up to #5131, since I don't personally like the way it worked.
This commit is contained in:
nicole mazzuca
2022-04-13 11:42:57 -07:00
committed by GitHub
parent 10792a29f7
commit 87c684c7da
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
crates/nu-command/src/system/run_external.rs
View File

@ -397,25 +397,10 @@ impl ExternalCommand {
/// Spawn a command without shelling out to an external shell
pub fn spawn_simple_command(&self, cwd: &str) -> Result<std::process::Command, ShellError> {
let is_path = |arg: &str| {
let head = match arg.split_once(::std::path::is_separator) {
Some((x, _)) => x,
None => arg,
};
head == "~" || head.chars().all(|ch| ch == '.')
};
let expand_path = |arg: String| {
if is_path(&arg) {
nu_path::expand_path_with(arg, cwd)
.to_string_lossy()
.to_string()
} else {
arg
}
};
let head = trim_enclosing_quotes(&self.name.item);
let head = expand_path(head);
let head = nu_path::expand_path_for_external_programs(head)
.to_string_lossy()
.to_string();
let mut process = std::process::Command::new(&head);
@ -424,7 +409,9 @@ impl ExternalCommand {
item: trim_enclosing_quotes(&arg.item),
span: arg.span,
};
arg.item = expand_path(arg.item);
arg.item = nu_path::expand_path_for_external_programs(arg.item)
.to_string_lossy()
.to_string();
let cwd = PathBuf::from(cwd);