Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add taskkill action to windows install #246

Merged
merged 2 commits into from
Oct 1, 2018
Merged

Add taskkill action to windows install #246

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a028a45
Add taskkill action to windows install
marcparadise Sep 27, 2018
855834e
Merge branch 'master' into mp/ensure-win-proc-killed-on-install
jonsmorrow Oct 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions omnibus/resources/chef-workstation/msi/source.wxs.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;"
Expand All @@ -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>
Expand Down