remove shell handling for unix/windows, use shellwords instead and dont invoke a shell

Author: rikonor

Cargo.lock

@@ -23,6 +23,7 @@ pocket-ic = "9.0.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.9.34"
+shellwords = "1.1.0"
 snafu = "0.8.5"
 tempfile = "3"
 time = "0.3.9"

Cargo.toml

@@ -7,4 +7,5 @@ edition = "2024"
 async-trait = { workspace = true }
 camino = { workspace = true }
 serde = { workspace = true }
+shellwords = { workspace = true }
 snafu = { workspace = true }

lib/icp-adapter/Cargo.toml

@@ -8,7 +8,6 @@ use snafu::Snafu;
 pub mod motoko;
 pub mod rust;
 pub mod script;
-pub mod shell;
 
 #[async_trait]
 pub trait Adapter {

lib/icp-adapter/src/lib.rs

@@ -1,10 +1,9 @@
-use std::process::{Command, Stdio};
-
-use crate::{Adapter, AdapterCompileError, shell::SHELL};
+use crate::{Adapter, AdapterCompileError};
 use async_trait::async_trait;
 use camino::Utf8PathBuf;
 use serde::Deserialize;
-use snafu::{ResultExt, Snafu};
+use snafu::{OptionExt, ResultExt, Snafu};
+use std::process::{Command, Stdio};
 
 /// Configuration for a custom canister build adapter.
 #[derive(Debug, Deserialize)]
@@ -16,11 +15,22 @@ pub struct ScriptAdapter {
 #[async_trait]
 impl Adapter for ScriptAdapter {
     async fn compile(&self, path: Utf8PathBuf) -> Result<(), AdapterCompileError> {
+        // Parse command input
+        let input = shellwords::split(&self.command).context(CommandParseSnafu {
+            command: &self.command,
+        })?;
+
+        // Separate command and args
+        let (cmd, args) = input.split_first().context(InvalidCommandSnafu {
+            command: &self.command,
+            reason: "command must include at least one element".to_string(),
+        })?;
+
         // Command
-        let mut cmd = Command::new(SHELL.binary());
+        let mut cmd = Command::new(cmd);
 
-        // Script
-        cmd.arg(SHELL.exec_flag()).arg(&self.command);
+        // Args
+        cmd.args(args);
 
         // Set directory
         cmd.current_dir(&path);
@@ -53,6 +63,15 @@ impl Adapter for ScriptAdapter {
 
 #[derive(Debug, Snafu)]
 pub enum ScriptAdapterCompileError {
+    #[snafu(display("failed to parse command {command}: {source}"))]
+    CommandParse {
+        command: String,
+        source: shellwords::MismatchedQuotes,
+    },
+
+    #[snafu(display("invalid command {command}: {reason}"))]
+    InvalidCommand { command: String, reason: String },
+
     #[snafu(display("failed to execute command {command}: {source}"))]
     CommandInvoke {
         command: String,