public/warp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Supports execution of other file types on Windows, e.g. .bat, .cmd

Browse Source
This commit is contained in:
Diego Giagio 2018-10-15 17:38:17 +02:00
parent 7d44d25e38
commit 8d21006f05
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
warp-runner/src/executor.rs
View File

@ -28,9 +28,14 @@ pub fn execute(target: &Path) -> io::Result<i32> {
let args: Vec<String> = env::args().skip(1).collect();
trace!("args={:?}", args);
Ok(Command::new(target_file_name)
.env("PATH", path_env)
do_execute(target_file_name, &args, &path_env)
}
#[cfg(target_family = "unix")]
fn do_execute(target: &str, args: &[String], path_env: &str) -> io::Result<i32> {
Ok(Command::new(target)
.args(args)
.env("PATH", path_env)
.stdin(Stdio::inherit())
.stdout(Stdio::inherit())
.stderr(Stdio::inherit())
@ -38,3 +43,21 @@ pub fn execute(target: &Path) -> io::Result<i32> {
.wait()?
.code().unwrap_or(1))
}
#[cfg(target_family = "windows")]
fn do_execute(target: &str, args: &[String], path_env: &str) -> io::Result<i32> {
let mut cmd_args = Vec::with_capacity(args.len() + 2);
cmd_args.push("/c".to_string());
cmd_args.push(target.to_string());
cmd_args.extend_from_slice(&args);
Ok(Command::new("cmd")
.args(cmd_args)
.env("PATH", path_env)
.stdin(Stdio::inherit())
.stdout(Stdio::inherit())
.stderr(Stdio::inherit())
.spawn()?
.wait()?
.code().unwrap_or(1))
}