From 62aae4f5dc2e678176857096af37bfbc725731c9 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Sat, 7 Nov 2020 17:50:01 +0100
Subject: installer: move wg.exe to C:\Program Files\WireGuard

...and append C:\Program Files\WireGuard to the path.

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 installer/build.bat     |  3 ---
 installer/wireguard.wxs | 14 +++-----------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/installer/build.bat b/installer/build.bat
index 0cd8917f..ef73d147 100644
--- a/installer/build.bat
+++ b/installer/build.bat
@@ -12,10 +12,7 @@ set WIREGUARD_VERSION=%WIREGUARD_VERSION:"=%
 
 set WIX_CANDLE_FLAGS=-nologo -dWIREGUARD_VERSION="%WIREGUARD_VERSION%"
 set WIX_LIGHT_FLAGS=-nologo -spdb
-set WIX_LIGHT_FLAGS=%WIX_LIGHT_FLAGS% -sw1056
-set WIX_LIGHT_FLAGS=%WIX_LIGHT_FLAGS% -sice:ICE30
 set WIX_LIGHT_FLAGS=%WIX_LIGHT_FLAGS% -sice:ICE61
-set WIX_LIGHT_FLAGS=%WIX_LIGHT_FLAGS% -sice:ICE09
 
 if exist .deps\prepared goto :build
 :installdeps
diff --git a/installer/wireguard.wxs b/installer/wireguard.wxs
index ae08ac4a..f45a071c 100644
--- a/installer/wireguard.wxs
+++ b/installer/wireguard.wxs
@@ -62,10 +62,6 @@
 				<Directory Id="WireGuardFolder" Name="WireGuard" />
 			</Directory>
 			<Directory Id="ProgramMenuFolder" />
-			<Directory Id="SystemFolder" />
-			<?if $(var.WIREGUARD_PLATFORM) != "x86"?>
-			<Directory Id="System64Folder" />
-			<?endif?>
 		</Directory>
 
 		<!--
@@ -78,14 +74,10 @@
 				</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>
-			<Component Directory="SystemFolder" Win64="no" Id="Wg32Executable" Guid="5ca31841-97d8-4614-a318-f1e268135ba7">
-				<File Source="..\x86\wg.exe" Id="Wg32Executable" />
+			<Component Directory="WireGuardFolder" Id="WgExecutable" Guid="540cf446-fcc3-4452-b9fb-eb4c02780251">
+				<File Source="..\$(var.WIREGUARD_PLATFORM)\wg.exe" KeyPath="yes" />
+				<Environment Id="PATH" Name="PATH" System="yes" Action="set" Part="last" Permanent="no" Value="[WireGuardFolder]" />
 			</Component>
-			<?if $(var.WIREGUARD_PLATFORM) != "x86"?>
-			<Component Directory="System64Folder" Win64="yes" Id="Wg64Executable" Guid="d9b494ec-0959-442c-89ad-6aa175acfd03">
-				<File Source="..\$(var.WIREGUARD_PLATFORM)\wg.exe" Id="Wg64Executable" />
-			</Component>
-			<?endif?>
 		</ComponentGroup>
 
 		<!--
-- 
cgit v1.2.3-59-g8ed1b