Whoops. Fixes #167

Cargo.toml

@@ -30,6 +30,7 @@ clap = "2.33.1"
 log = "0.4.8"
 stderrlog = "0.4.3"
 watchexec = "=1.14.0"
+shell-escape = "0.1.5"
 
 [dev-dependencies]
 assert_cmd = "1.0.1"

src/args.rs

@@ -167,7 +167,7 @@ pub fn parse() -> ArgMatches<'static> {
                 .arg(
                     Arg::with_name("cmd:trail")
                         .raw(true)
-                        .help("Full command to run. -x and -s will be ignored!")
+                        .help("Full command to run. -x and -s will be ignored!"),
                 )
                 .after_help(footnote.as_str()),
         );

src/lib.rs

@@ -75,7 +75,12 @@ pub fn set_commands(builder: &mut ArgsBuilder, matches: &ArgMatches) {
 
     if matches.is_present("cmd:trail") {
         debug!("trailing command is present, ignore all other command options");
-        commands = vec![value_t!(matches, "cmd:trail", String).unwrap_or_else(|e| e.exit())];
+        commands = vec![values_t!(matches, "cmd:trail", String)
+            .unwrap_or_else(|e| e.exit())
+            .into_iter()
+            .map(|arg| shell_escape::escape(arg.into()))
+            .collect::<Vec<_>>()
+            .join(" ")];
     }
 
     // Default to `cargo check`

src/main.rs

@@ -1,7 +1,7 @@
 //! Watch files in a Cargo project and compile it when they change
 #![warn(clippy::all)]
 
-use cargo_watch::{args, change_dir, watch::CwHandler, get_options};
+use cargo_watch::{args, change_dir, get_options, watch::CwHandler};
 use stderrlog::Timestamp;
 use watchexec::{error::Result, run::watch};
 
@@ -16,7 +16,11 @@ fn main() -> Result<()> {
     stderrlog::new()
         .quiet(quiet)
         .verbosity(if debug { 3 } else { 1 })
-        .timestamp(if testing { Timestamp::Off } else { Timestamp::Millisecond })
+        .timestamp(if testing {
+            Timestamp::Off
+        } else {
+            Timestamp::Millisecond
+        })
         .init()
         .unwrap();