fix: wait for spawned tasks to die before exiting (#2461)

Fixes #2418

Cargo.toml

@@ -125,7 +125,8 @@ xx = { version = "1.0.0", features = ["glob"] }
 zip = { version = "2", default-features = false, features = ["deflate"] }
 
 [target.'cfg(unix)'.dependencies]
-exec = "0.3.1"
+exec = "0.3"
+nix = {version="0.29", features=["signal", "user"]}
 
 [build-dependencies]
 built = { version = "0.7", features = ["chrono", "git2"] }

src/cli/run.rs

@@ -1,8 +1,6 @@
 use std::collections::{BTreeMap, HashSet};
 use std::io::Write;
 use std::iter::once;
-#[cfg(unix)]
-use std::os::unix::prelude::*;
 use std::path::{Path, PathBuf};
 use std::process::{exit, Stdio};
 use std::sync::atomic::{AtomicUsize, Ordering};
@@ -186,6 +184,7 @@ impl Run {
         let pool = rayon::ThreadPoolBuilder::new()
             .num_threads(self.jobs() + 1)
             .build()?;
+        let exit_status = Mutex::new(None);
         pool.scope(|s| {
             let run = |task: &Task| {
                 let t = task.clone();
@@ -194,7 +193,11 @@ impl Run {
                     trace!("running tasks: {task}");
                     if let Err(err) = self.run_task(config, &env, &task) {
                         error!("{err}");
-                        exit(1);
+                        if let Some(ScriptFailed(_, Some(status))) = err.downcast_ref::<Error>() {
+                            *exit_status.lock().unwrap() = status.code();
+                        } else {
+                            *exit_status.lock().unwrap() = Some(1);
+                        }
                     }
                     let mut tasks = tasks.lock().unwrap();
                     tasks.remove(&task);
@@ -211,6 +214,11 @@ impl Run {
             info!("{}", style::edim(msg));
         };
 
+        if let Some(status) = *exit_status.lock().unwrap() {
+            debug!("exiting with status: {status}");
+            exit(status);
+        }
+
         Ok(())
     }
 
@@ -340,22 +348,7 @@ impl Run {
         if self.dry_run {
             return Ok(());
         }
-        if let Err(err) = cmd.execute() {
-            if let Some(ScriptFailed(_, Some(status))) = err.downcast_ref::<Error>() {
-                if let Some(code) = status.code() {
-                    error!("{prefix} exited with code {code}");
-                    exit(code);
-                } else {
-                    #[cfg(unix)]
-                    if let Some(signal) = status.signal() {
-                        error!("{prefix} killed by signal {signal}");
-                        exit(1);
-                    }
-                }
-            }
-            error!("{err}");
-            exit(1);
-        }
+        cmd.execute()?;
         trace!("{prefix} exited successfully");
         Ok(())
     }

src/cmd.rs

@@ -323,7 +323,10 @@ impl<'a> CmdLineRunner<'a> {
                 #[cfg(not(any(test, target_os = "windows")))]
                 ChildProcessOutput::Signal(sig) => {
                     if sig != SIGINT {
-                        cmd!("kill", format!("-{sig}"), id.to_string()).run()?;
+                        debug!("Received signal {}, {id}", sig);
+                        let pid = nix::unistd::Pid::from_raw(id as i32);
+                        let sig = nix::sys::signal::Signal::try_from(sig).unwrap();
+                        nix::sys::signal::kill(pid, sig)?;
                     }
                 }
             }