From a028a450ba82e06bc4b4d5f4721a7d7549d7310f Mon Sep 17 00:00:00 2001
From: "Marc A. Paradise" <marc.paradise@gmail.com>
Date: Thu, 27 Sep 2018 17:19:40 -0400
Subject: [PATCH] Add taskkill action to windows install

This adds a 'taskkill' of 'Chef Workstation App.exe'
after the installer initializes.  This will prevent installations
from failing because the tray app executable is in use and
can't be replaced.

Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
Signed-off-by: tyler-ball <tball@chef.io>
---
 omnibus/resources/chef-workstation/msi/source.wxs.erb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/omnibus/resources/chef-workstation/msi/source.wxs.erb b/omnibus/resources/chef-workstation/msi/source.wxs.erb
index 475ff2d5d..e2d76fdf5 100644
--- a/omnibus/resources/chef-workstation/msi/source.wxs.erb
+++ b/omnibus/resources/chef-workstation/msi/source.wxs.erb
@@ -36,6 +36,13 @@
     <Binary Id="CustomActionFastMsiDLL"
       SourceFile="CustomActionFastMsi.CA.dll" />
 
+    <Property Id="WixQuietExecCmdLine" Value='"[WindowsFolder]\System32\taskkill.exe" /T /F /IM "Chef Workstation App*"' />
+    <CustomAction Id="TaskKill"
+      BinaryKey="WixCA"
+      DllEntry="WixQuietExec"
+      Execute="immediate"
+      Return="ignore" />
+
     <CustomAction Id="Cleanup"
       Directory="INSTALLLOCATION"
       ExeCommand="cmd /C &quot;rd /S /Q chef-workstation&quot;"
@@ -44,6 +51,7 @@
       Return="ignore" />
 
     <InstallExecuteSequence>
+      <Custom Action="TaskKill" After="InstallInitialize">1</Custom>
       <Custom Action="FastUnzip" After="InstallFiles">NOT Installed OR REINSTALL</Custom>
       <Custom Action="Cleanup" After="RemoveFiles">REMOVE~="ALL"</Custom>
     </InstallExecuteSequence>