From 4cb5b214f74e269f3656e7caadc11be65767e4e0 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Wed, 18 Nov 2020 12:21:05 +0100
Subject: installer: refactor custom actions to appear in chronological order

...in the source code.

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 installer/wireguard.wxs | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'installer/wireguard.wxs')

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>
 
 		<!--
@@ -133,6 +133,14 @@
 			<Custom Action="EvaluateWireGuardComponents" After="ProcessComponents" />
 		</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
 		-->
@@ -149,14 +157,6 @@
 			<Custom Action="RemoveAdapters" Before="RemoveFiles" />
 		</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
 		-->
-- 
cgit v1.2.3-59-g8ed1b