Public/nushell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove partial fix

Browse Source
This commit is contained in:
Jonathan Turner 2019-06-01 15:11:56 +12:00
parent 196667d260
commit b8d8f82cda
2 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/commands/classified.rs
View File

@ -125,47 +125,33 @@ impl ExternalCommand {
input: ClassifiedInputStream,
stream_next: StreamNext,
) -> Result<ClassifiedInputStream, ShellError> {
let mut process;
#[cfg(windows)]
{
process = Exec::cmd("cmd.exe");
}
#[cfg(not(windows))]
{
process = Exec::cmd("sh");
}
let inputs: Vec<Value> = input.objects.collect().await;
let mut arg_string = format!("{}", self.name);
for arg in self.args {
for arg in &self.args {
arg_string.push_str(" ");
arg_string.push_str(&arg);
}
let mut process = Exec::shell(&self.name);
if arg_string.contains("$it") {
let mut new_arg_string = String::new();
let tmp = arg_string.clone();
let mut first = true;
for i in &inputs {
if !first {
new_arg_string.push_str(" && ");
process = process.arg("&&");
process = process.arg(&self.name);
} else {
first = false;
}
new_arg_string.push_str(&tmp.replace("$it", &i.as_string().unwrap()));
for arg in &self.args {
process = process.arg(&arg.replace("$it", &i.as_string().unwrap()));
}
}
} else {
for arg in &self.args {
process = process.arg(arg);
}
arg_string = new_arg_string;
}
#[cfg(windows)]
{
process = process.args(&["/c", &arg_string]);
}
#[cfg(not(windows))]
{
process = process.args(&["-c", &arg_string]);
}
process = process.cwd(context.env.lock().unwrap().cwd());

2
src/parser/ast.rs
View File

@ -230,7 +230,7 @@ impl Leaf {
fn as_external_arg(&self) -> String {
match self {
Leaf::String(s) => format!("\"{}\"", s),
Leaf::String(s) => format!("{}", s),
Leaf::Bare(path) => format!("{}", path.to_string()),
Leaf::Boolean(b) => format!("{}", b),
Leaf::Int(i) => format!("{}", i),