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

Merge pull request #1014 from jonathandturner/fix_1013

Browse Source 
expand tilde in externals
This commit is contained in:
Jonathan Turner 2019-11-27 06:52:30 +13:00 committed by GitHub
commit 2e4b0b0b17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/commands/classified/external.rs
View File

@ -98,6 +98,8 @@ impl Command {
arg_string.push_str(&arg);
}
let home_dir = dirs::home_dir();
trace!(target: "nu::run::external", "command = {:?}", self.name);
let mut process;
@ -129,6 +131,13 @@ impl Command {
if arg.chars().all(|c| c.is_whitespace()) {
None
} else {
// Let's also replace ~ as we shell out
let arg = if let Some(ref home_dir) = home_dir {
arg.replace("~", home_dir.to_str().unwrap())
} else {
arg.replace("~", "~")
};
Some(arg.replace("$it", &i))
}
});
@ -140,6 +149,13 @@ impl Command {
} else {
process = Exec::cmd(&self.name);
for arg in &self.args.list {
// Let's also replace ~ as we shell out
let arg = if let Some(ref home_dir) = home_dir {
arg.replace("~", home_dir.to_str().unwrap())
} else {
arg.replace("~", "~")
};
let arg_chars: Vec<_> = arg.chars().collect();
if arg_chars.len() > 1
&& arg_chars[0] == '"'
@ -149,7 +165,7 @@ impl Command {
let new_arg: String = arg_chars[1..arg_chars.len() - 1].iter().collect();
process = process.arg(new_arg);
} else {
process = process.arg(arg.arg.clone());
process = process.arg(arg.clone());
}
}
}