From 8318e76f69a742116790ee9b164306985be937f7 Mon Sep 17 00:00:00 2001
From: Max Coppen <44031065+mxcop@users.noreply.github.com>
Date: Tue, 1 Nov 2022 17:53:10 +0100
Subject: [PATCH 1/2] fix: windows build command

---
 build.rs | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/build.rs b/build.rs
index 650e3d0..64cff85 100644
--- a/build.rs
+++ b/build.rs
@@ -1,17 +1,29 @@
 use std::process::Command;
 
 fn main() {
-    Command::new("esbuild")
-        .args([
-            "--outdir=dist",
-            "--format=esm",
-            "--bundle",
-            "tauri/tooling/api/src/app.ts",
-            "tauri/tooling/api/src/clipboard.ts",
-            "tauri/tooling/api/src/tauri.ts",
-            "tauri/tooling/api/src/event.ts",
-            "tauri/tooling/api/src/mocks.ts",
-        ])
-        .output()
-        .unwrap();
+    /* Shared arguments */
+    let sargs: [&str; 8] = [
+        "--outdir=dist",
+        "--format=esm",
+        "--bundle",
+        "tauri/tooling/api/src/app.ts",
+        "tauri/tooling/api/src/clipboard.ts",
+        "tauri/tooling/api/src/tauri.ts",
+        "tauri/tooling/api/src/event.ts",
+        "tauri/tooling/api/src/mocks.ts",
+    ];
+
+    if cfg!(target_os = "windows") {
+        /* Use cmd if the target is windows */
+        Command::new("cmd")
+            .args(&["/C", "esbuild"])
+            .args(&sargs)
+            .output()
+            .unwrap();
+    } else {
+        Command::new("esbuild")
+            .args(&sargs)
+            .output()
+            .unwrap();
+    };
 }

From fdf0e608dc38561fa866cf56c3ed37c2fa3ad506 Mon Sep 17 00:00:00 2001
From: Max Coppen <44031065+mxcop@users.noreply.github.com>
Date: Tue, 1 Nov 2022 18:19:17 +0100
Subject: [PATCH 2/2] fix: panic if target unknown

---
 build.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.rs b/build.rs
index 64cff85..f0eae84 100644
--- a/build.rs
+++ b/build.rs
@@ -13,17 +13,19 @@ fn main() {
         "tauri/tooling/api/src/mocks.ts",
     ];
 
-    if cfg!(target_os = "windows") {
+    if cfg!(windows) {
         /* Use cmd if the target is windows */
         Command::new("cmd")
             .args(&["/C", "esbuild"])
             .args(&sargs)
             .output()
             .unwrap();
-    } else {
+    } else if cfg!(unix) {
         Command::new("esbuild")
             .args(&sargs)
             .output()
             .unwrap();
-    };
+    } else {
+        panic!("Unsupported build target");
+    }
 }