From b53a517bf84abf31af9aace4ff77653283362279 Mon Sep 17 00:00:00 2001
From: Viktor Liu <viktor@netbird.io>
Date: Tue, 24 Jun 2025 13:01:20 +0200
Subject: [PATCH] Don't open cmd.exe during MSI actions

---
 client/netbird.wxs | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/client/netbird.wxs b/client/netbird.wxs
index 5e03a014d..ae7b0fb62 100644
--- a/client/netbird.wxs
+++ b/client/netbird.wxs
@@ -46,28 +46,40 @@
 			<ComponentRef Id="NetbirdFiles" />
 		</ComponentGroup>
 
-		<Property Id="cmd" Value="cmd.exe"/>
-
 		<CustomAction Id="KillDaemon"
-                      ExeCommand='/c "taskkill /im netbird.exe"'
+                      BinaryRef="WixCA"
+                      DllEntry="WixQuietExec64"
                       Execute="deferred"
-                      Property="cmd"
                       Impersonate="no"
                       Return="ignore"
             />
 
 		<CustomAction Id="KillUI"
-                      ExeCommand='/c "taskkill /im netbird-ui.exe"'
+                      BinaryRef="WixCA"
+                      DllEntry="WixQuietExec64"
                       Execute="deferred"
-                      Property="cmd"
                       Impersonate="no"
                       Return="ignore"
             />
 
+		<CustomAction Id="SetKillDaemonCommand"
+                      Property="KillDaemon"
+                      Value="taskkill /f /im netbird.exe"
+                      Execute="immediate"
+            />
+
+		<CustomAction Id="SetKillUICommand"
+                      Property="KillUI"
+                      Value="taskkill /f /im netbird-ui.exe"
+                      Execute="immediate"
+            />
+
 		<InstallExecuteSequence>
 			<!-- For Uninstallation -->
+			<Custom Action="SetKillDaemonCommand" Before="KillDaemon" Condition="Installed"/>
 			<Custom Action="KillDaemon" Before="RemoveFiles" Condition="Installed"/>
-			<Custom Action="KillUI" After="KillDaemon" Condition="Installed"/>
+			<Custom Action="SetKillUICommand" After="KillDaemon" Condition="Installed"/>
+			<Custom Action="KillUI" After="SetKillUICommand" Condition="Installed"/>
 		</InstallExecuteSequence>
 
 		<!-- Icons -->