Fixed Using conditional compilation to fix running on both Windows an…

…d Linux
simonhyll · Dec 2, 2022 · 00eef86 · 00eef86
1 parent fe03580
commit 00eef86
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,7 +15,7 @@ license-file = "LICENSE.txt"
 name = "cargo-commander"
 readme = "README.md"
 repository = "https://github.com/simonhyll/cargo-commander"
-version = "2.0.14"
+version = "2.0.15"
 default-run = "cargo-cmd"
 
 [[bin]]

diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ cargo install cargo-commander
 cargo cmd COMMAND
 
 # Output of 'cargo cmd --help'
-cargo-commander 2.0.14
+cargo-commander 2.0.15
 A powerful tool for managing project commands
 
 USAGE:

diff --git a/src/command.rs b/src/command.rs
@@ -126,7 +126,8 @@ impl Command {
 
             let spawned_child;
 
-            if cfg!(windows) {
+            #[cfg(target_os = "windows")]
+            {
                 use std::os::windows::process::CommandExt;
                 spawned_child = std::process::Command::new("cmd")
                     .arg("/C")
@@ -136,11 +137,13 @@ impl Command {
                     .current_dir(&working_dir)
                     .spawn()
                     .expect("failed to spawn");
-            } else {
+            }
+            #[cfg(not(target_os = "windows"))]
+            {
                 spawned_child = std::process::Command::new("sh")
                     .arg("-c")
-                    .args(cmd)
-                    .args(&args)
+                    .arg(cmd.join(" "))
+                    .arg(args.join(" "))
                     .envs(&self.env)
                     .current_dir(&working_dir)
                     .spawn()

diff --git a/src/main.rs b/src/main.rs
@@ -53,7 +53,7 @@ fn main() -> Result<(), std::io::Error> {
                     commander_args.insert("parallel".to_string(), args.remove(0));
                 } else if args[0] == "-h" || args[0] == "--help" {
                     println!(
-                        r"cargo-commander 2.0.14
+                        r"cargo-commander 2.0.15
 A powerful tool for managing project commands
 
 USAGE:

diff --git a/tauri.conf.json b/tauri.conf.json
@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "Cargo Commander",
-    "version": "2.0.14"
+    "version": "2.0.15"
   },
   "tauri": {
     "allowlist": {