Robot
/
watchexec
mirror of https://github.com/watchexec/watchexec.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename spawn args positively

This commit is contained in:
Félix Saparelli 2021-04-11 01:44:44 +12:00
parent 7965ccb605
commit 2a382a9486
No known key found for this signature in database
GPG Key ID: B948C4BAE44FC474
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/process.rs
View File

@ -8,10 +8,10 @@ use std::path::PathBuf;
pub fn spawn( pub fn spawn(
cmd: &[String], cmd: &[String],
updated_paths: &[PathOp], updated_paths: &[PathOp],
no_shell: bool, shell: bool,
no_environment: bool, environment: bool,
) -> Result<Process> { ) -> Result<Process> {
self::imp::Process::new(cmd, updated_paths, no_shell, no_environment).map_err(|e| e.into()) self::imp::Process::new(cmd, updated_paths, shell, environment).map_err(|e| e.into())
} }
pub use self::imp::Process; pub use self::imp::Process;
@ -45,19 +45,19 @@ mod imp {
pub fn new( pub fn new(
cmd: &[String], cmd: &[String],
updated_paths: &[PathOp], updated_paths: &[PathOp],
no_shell: bool, shell: bool,
no_environment: bool, environment: bool,
) -> Result<Self> { ) -> Result<Self> {
use nix::unistd::*; use nix::unistd::*;
use std::convert::TryInto; use std::convert::TryInto;
use std::os::unix::process::CommandExt; use std::os::unix::process::CommandExt;
// Assemble command to run. // Assemble command to run.
// This is either the first argument from cmd (if no_shell was given) or "sh". // This is either the first argument from cmd (if shell == false) or "sh".
// Using "sh -c" gives us features like supporting pipes and redirects, // Using "sh -c" gives us features like supporting pipes and redirects,
// but is a little less performant and can cause trouble when using custom signals // but is a little less performant and can cause trouble when using custom signals
// (e.g. --signal SIGHUP) // (e.g. --signal SIGHUP)
let mut command = if no_shell { let mut command = if !shell {
let (head, tail) = cmd.split_first().expect("cmd was empty"); let (head, tail) = cmd.split_first().expect("cmd was empty");
let mut command = Command::new(head); let mut command = Command::new(head);
command.args(tail); command.args(tail);
@ -71,7 +71,7 @@ mod imp {
debug!("Assembled command {:?}", command); debug!("Assembled command {:?}", command);
let command_envs = if no_environment { let command_envs = if !environment {
Vec::new() Vec::new()
} else { } else {
super::collect_path_env_vars(updated_paths) super::collect_path_env_vars(updated_paths)
@ -200,8 +200,8 @@ mod imp {
pub fn new( pub fn new(
cmd: &[String], cmd: &[String],
updated_paths: &[PathOp], updated_paths: &[PathOp],
no_shell: bool, shell: bool,
no_environment: bool, environment: bool,
) -> Result<Self> { ) -> Result<Self> {
use std::convert::TryInto; use std::convert::TryInto;
use std::os::windows::io::IntoRawHandle; use std::os::windows::io::IntoRawHandle;
@ -263,7 +263,7 @@ mod imp {
} }
let mut command; let mut command;
if no_shell { if !shell {
let (first, rest) = cmd.split_first().expect("command is empty"); let (first, rest) = cmd.split_first().expect("command is empty");
command = Command::new(first); command = Command::new(first);
command.args(rest); command.args(rest);
@ -277,7 +277,7 @@ mod imp {
command.creation_flags(CREATE_SUSPENDED); command.creation_flags(CREATE_SUSPENDED);
debug!("Assembled command {:?}", command); debug!("Assembled command {:?}", command);
let command_envs = if no_environment { let command_envs = if !environment {
Vec::new() Vec::new()
} else { } else {
super::collect_path_env_vars(updated_paths) super::collect_path_env_vars(updated_paths)