diff options
| author |   Simon Rozman <simon@rozman.si> | 2020-11-18 12:21:05 +0100 |
|---|---|---|
| committer |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-11-18 14:30:02 +0100 |
| commit | 4cb5b214f74e269f3656e7caadc11be65767e4e0 (patch) | |
| tree | 6c59235c6fc9f02c06224e6245b8040f78587d66 /installer/wireguard.wxs | |
| parent | installer: prevent the process killing on upgrade cleanup (diff) | |
| download | wireguard-windows-4cb5b214f74e269f3656e7caadc11be65767e4e0.tar.xz wireguard-windows-4cb5b214f74e269f3656e7caadc11be65767e4e0.zip | |
installer: refactor custom actions to appear in chronological order
...in the source code.
Signed-off-by: Simon Rozman <simon@rozman.si>
Diffstat (limited to 'installer/wireguard.wxs')
| -rw-r--r-- | installer/wireguard.wxs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/installer/wireguard.wxs b/installer/wireguard.wxs index 31f57426..ba0ee46e 100644 --- a/installer/wireguard.wxs +++ b/installer/wireguard.wxs @@ -110,19 +110,19 @@ </InstallExecuteSequence> <!-- - Launch wireguard.exe on product reconfiguration (starting same MSI again) + Evaluate WireGuard services and populate ServiceControl table --> - <CustomAction Id="LaunchApplicationAndAbort" BinaryKey="customactions.dll" DllEntry="LaunchApplicationAndAbort" /> + <CustomAction Id="EvaluateWireGuardServices" BinaryKey="customactions.dll" DllEntry="EvaluateWireGuardServices" /> <InstallExecuteSequence> - <Custom Action="LaunchApplicationAndAbort" After="CostFinalize">ProductState=5 AND NOT REMOVE AND NOT DO_NOT_LAUNCH</Custom> + <Custom Action="EvaluateWireGuardServices" After="FindRelatedProducts" /> </InstallExecuteSequence> <!-- - Evaluate WireGuard services and populate ServiceControl table + Launch wireguard.exe on product reconfiguration (starting same MSI again) --> - <CustomAction Id="EvaluateWireGuardServices" BinaryKey="customactions.dll" DllEntry="EvaluateWireGuardServices" /> + <CustomAction Id="LaunchApplicationAndAbort" BinaryKey="customactions.dll" DllEntry="LaunchApplicationAndAbort" /> <InstallExecuteSequence> - <Custom Action="EvaluateWireGuardServices" After="FindRelatedProducts" /> + <Custom Action="LaunchApplicationAndAbort" After="CostFinalize">ProductState=5 AND NOT REMOVE AND NOT DO_NOT_LAUNCH</Custom> </InstallExecuteSequence> <!-- @@ -134,6 +134,14 @@ </InstallExecuteSequence> <!-- + Kill lingering processes + --> + <CustomAction Id="KillWireGuardProcesses" BinaryKey="customactions.dll" DllEntry="KillWireGuardProcesses" Execute="deferred" Impersonate="no" /> + <InstallExecuteSequence> + <Custom Action="KillWireGuardProcesses" After="StopServices" /> + </InstallExecuteSequence> + + <!-- Clear out our config folder on uninstall --> <CustomAction Id="RemoveConfigFolder" BinaryKey="customactions.dll" DllEntry="RemoveConfigFolder" Execute="deferred" Impersonate="no" /> @@ -150,14 +158,6 @@ </InstallExecuteSequence> <!-- - Kill lingering processes - --> - <CustomAction Id="KillWireGuardProcesses" BinaryKey="customactions.dll" DllEntry="KillWireGuardProcesses" Execute="deferred" Impersonate="no" /> - <InstallExecuteSequence> - <Custom Action="KillWireGuardProcesses" After="StopServices" /> - </InstallExecuteSequence> - - <!-- Launch wireguard.exe after setup complete --> <CustomAction Id="LaunchApplication" HideTarget="yes" Impersonate="no" Execute="deferred" FileKey="wireguard.exe" ExeCommand="" Return="asyncNoWait" /> |