From 0b0fe0e1cfd31e485e6c151ddac90cd55749b732 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Fri, 16 Aug 2019 09:53:59 +0200
Subject: installer: hardcode %ProgramFiles%\WireGuard install folder

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

(limited to 'installer/wireguard.wxs')

diff --git a/installer/wireguard.wxs b/installer/wireguard.wxs
index 492422dd..7d7a7b5a 100644
--- a/installer/wireguard.wxs
+++ b/installer/wireguard.wxs
@@ -52,28 +52,13 @@
 			AllowSameVersionUpgrades="yes"
 			DowngradeErrorMessage="A newer version of [ProductName] is already installed."
 			Schedule="afterInstallExecute" />
-		<Property Id="INSTALLFOLDERPREV">
-			<ComponentSearch Id="WireGuardExecutable" Guid="c3508d23-3362-47ce-9220-321bdb1a1acc" />
-		</Property>
-		<SetProperty
-			After="AppSearch"
-			Action="SetInstallFolderPrev"
-			Id="INSTALLFOLDER"
-			Value="[INSTALLFOLDERPREV]"
-			Sequence="first"><![CDATA[INSTALLFOLDERPREV AND NOT Installed]]></SetProperty>
-		<SetProperty
-			After="SetInstallFolderPrev"
-			Action="SetInstallFolderParam"
-			Id="INSTALLFOLDER"
-			Value="[INSTALLDIR]"
-			Sequence="first"><![CDATA[INSTALLDIR AND NOT Installed]]></SetProperty>
 
 		<!--
 			Folders
 		-->
 		<Directory Id="TARGETDIR" Name="SourceDir">
 			<Directory Id="$(var.PlatformProgramFilesFolder)">
-				<Directory Id="INSTALLFOLDER" Name="WireGuard" />
+				<Directory Id="WireGuardFolder" Name="WireGuard" />
 			</Directory>
 			<Directory Id="ProgramMenuFolder" />
 			<Directory Id="SystemFolder" />
@@ -86,9 +71,9 @@
 			Components
 		-->
 		<ComponentGroup Id="WireGuardComponents">
-			<Component Directory="INSTALLFOLDER" Id="WireGuardExecutable" Guid="c3508d23-3362-47ce-9220-321bdb1a1acc">
+			<Component Directory="WireGuardFolder" Id="WireGuardExecutable" Guid="c3508d23-3362-47ce-9220-321bdb1a1acc">
 				<File Source="..\$(var.WIREGUARD_PLATFORM)\wireguard.exe" KeyPath="yes">
-					<Shortcut Id="WireGuardStartMenuShortcut" Directory="ProgramMenuFolder" Name="WireGuard" Description="WireGuard: Fast, Modern, Secure VPN Tunnel" WorkingDirectory="INSTALLFOLDER" Advertise="yes" />
+					<Shortcut Id="WireGuardStartMenuShortcut" Directory="ProgramMenuFolder" Name="WireGuard" Description="WireGuard: Fast, Modern, Secure VPN Tunnel" WorkingDirectory="WireGuardFolder" Advertise="yes" />
 				</File>
 				<ServiceControl Id="DummyService.3AA0C492_29F4_4342_B608_DB95B2DECB13" Name="DummyService.3AA0C492_29F4_4342_B608_DB95B2DECB13" /><!-- A dummy to make WiX create ServiceControl table for us. -->
 			</Component>
@@ -105,14 +90,14 @@
 		<!--
 			Merge modules
 		-->
-		<DirectoryRef Id="INSTALLFOLDER">
+		<DirectoryRef Id="WireGuardFolder">
 			<Merge Id="WintunMergeModule" Language="0" DiskId="1" SourceFile=".deps\wintun-$(var.WIREGUARD_PLATFORM).msm" />
 		</DirectoryRef>
 
 		<!--
 			Features
 		-->
-		<Feature Id="WireGuardFeature" Title="WireGuard" Level="1" ConfigurableDirectory="INSTALLFOLDER">
+		<Feature Id="WireGuardFeature" Title="WireGuard" Level="1">
 			<ComponentGroupRef Id="WireGuardComponents" />
 		</Feature>
 		<Feature Id="WintunFeature" Title="Wintun" Level="1">
-- 
cgit v1.2.3-59-g8ed1b