#37: Quote the path to Shawl itself

mtkennerly · Sep 30, 2023 · 277aa1d · 277aa1d
1 parent e70280f
commit 277aa1d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Unreleased
+
+* Fixed: The path to the Shawl executable was not quoted when it contained spaces.
+
 ## v1.2.1 (2023-08-10)
 
 * Fixed: Possible case in which old log files would not be deleted.

diff --git a/src/control.rs b/src/control.rs
@@ -3,7 +3,11 @@ use log::error;
 use std::io::Write;
 
 pub fn add_service(name: String, cwd: Option<String>, opts: CommonOpts) -> Result<(), ()> {
-    let shawl_path = std::env::current_exe().expect("Unable to determine Shawl location");
+    let shawl_path = quote(
+        &std::env::current_exe()
+            .expect("Unable to determine Shawl location")
+            .to_string_lossy(),
+    );
     let shawl_args = construct_shawl_run_args(&name, &cwd, &opts);
     let prepared_command = prepare_command(&opts.command);
 
@@ -13,7 +17,7 @@ pub fn add_service(name: String, cwd: Option<String>, opts: CommonOpts) -> Resul
         .arg("binPath=")
         .arg(format!(
             "{} {} -- {}",
-            shawl_path.display(),
+            shawl_path,
             shawl_args.join(" "),
             prepared_command.join(" ")
         ))