Merge pull request #302 from Metaswitch/issue/62/fixshells

Use shell_words to split the outer shell so that more complex outer shells can be used.

Author: Max Dymond

CHANGELOG.md

@@ -16,6 +16,7 @@ Status: Available for use
 ### Added
 
 ### Fixed
+- #62: Use shell_words to split the outer shell so that more complex outer shells can be used.
 
 ## [1.2.0] - 2023-07-07
 

Cargo.lock

@@ -31,6 +31,7 @@ thiserror = "1.0.40"
 tera = "1"
 serde_json = "1.0.100"
 toml = "0.7.6"
+shell-words = "1.1.0"
 
 [dev-dependencies]
 tempfile = "3.6.0"

Cargo.toml

@@ -40,11 +40,13 @@ impl Drop for DaemonHandle {
 }
 
 impl DockerCommandBuilder {
-    pub fn run(&self, command: &[&str]) -> Result<(), Error> {
-        debug!(
-            "Spawning docker command with configuration: {:?} args: {:?}",
-            self, command
-        );
+    pub fn run<I, S>(&self, command: I) -> Result<(), Error>
+    where
+        I: IntoIterator<Item = S> + std::fmt::Debug,
+        S: AsRef<OsStr>,
+    {
+        debug!("Spawning docker command with configuration: {self:?}");
+        debug!("- and args: {command:?}");
 
         let mut command = Command::new("docker")
             .args(self.base_args())

src/command.rs

@@ -53,8 +53,13 @@ pub(crate) fn run_floki_container(
         None
     };
 
+    // Calculate the outer shell command.
     let subshell_command = subshell_command(&spec.init, inner_command);
-    cmd.run(&[spec.shell.outer_shell(), "-c", &subshell_command])
+    let mut outer_shell_cmd = shell_words::split(spec.shell.outer_shell())?;
+    outer_shell_cmd.push("-c".to_string());
+    outer_shell_cmd.push(subshell_command);
+
+    cmd.run(outer_shell_cmd)
 }
 
 pub(crate) fn command_in_shell(shell: &str, command: &[String]) -> String {