Skip to content

Commit d897365

Browse files
authored
[client] Don't open cmd.exe during MSI actions (#4041)
1 parent f37aa2c commit d897365

File tree

2 files changed

+6
-23
lines changed

2 files changed

+6
-23
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
pull_request:
1010

1111
env:
12-
SIGN_PIPE_VER: "v0.0.18"
12+
SIGN_PIPE_VER: "v0.0.19"
1313
GORELEASER_VER: "v2.3.2"
1414
PRODUCT_NAME: "NetBird"
1515
COPYRIGHT: "NetBird GmbH"

client/netbird.wxs

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<Wix
2-
xmlns="http://wixtoolset.org/schemas/v4/wxs">
2+
xmlns="http://wixtoolset.org/schemas/v4/wxs"
3+
xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
34
<Package Name="NetBird" Version="$(env.NETBIRD_VERSION)" Manufacturer="NetBird GmbH" Language="1033" UpgradeCode="6456ec4e-3ad6-4b9b-a2be-98e81cb21ccf"
45
InstallerVersion="500" Compressed="yes" Codepage="utf-8" >
56

7+
68
<MediaTemplate EmbedCab="yes" />
79

810
<Feature Id="NetbirdFeature" Title="Netbird" Level="1">
@@ -46,29 +48,10 @@
4648
<ComponentRef Id="NetbirdFiles" />
4749
</ComponentGroup>
4850

49-
<Property Id="cmd" Value="cmd.exe"/>
50-
51-
<CustomAction Id="KillDaemon"
52-
ExeCommand='/c "taskkill /im netbird.exe"'
53-
Execute="deferred"
54-
Property="cmd"
55-
Impersonate="no"
56-
Return="ignore"
57-
/>
51+
<util:CloseApplication Id="CloseNetBird" CloseMessage="no" Target="netbird.exe" RebootPrompt="no" />
52+
<util:CloseApplication Id="CloseNetBirdUI" CloseMessage="no" Target="netbird-ui.exe" RebootPrompt="no" />
5853

59-
<CustomAction Id="KillUI"
60-
ExeCommand='/c "taskkill /im netbird-ui.exe"'
61-
Execute="deferred"
62-
Property="cmd"
63-
Impersonate="no"
64-
Return="ignore"
65-
/>
6654

67-
<InstallExecuteSequence>
68-
<!-- For Uninstallation -->
69-
<Custom Action="KillDaemon" Before="RemoveFiles" Condition="Installed"/>
70-
<Custom Action="KillUI" After="KillDaemon" Condition="Installed"/>
71-
</InstallExecuteSequence>
7255

7356
<!-- Icons -->
7457
<Icon Id="NetbirdIcon" SourceFile=".\client\ui\assets\netbird.ico" />

0 commit comments

Comments
 (0)