From 25de46b2334a22edde769554bb4e7f6a68bed9d5 Mon Sep 17 00:00:00 2001
From: Kai Korla <kai@korla.cloud>
Date: Sun, 21 Jul 2024 21:28:24 +0200
Subject: [PATCH] - fix build-windows-installer.sh script - fix paths in
 main.wxs

---
 scripts/build-windows-installer.sh | 4 ++--
 wix/main.wxs                       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/build-windows-installer.sh b/scripts/build-windows-installer.sh
index 01b7e0e88..d7e0b9277 100755
--- a/scripts/build-windows-installer.sh
+++ b/scripts/build-windows-installer.sh
@@ -6,7 +6,7 @@ VERSION=$(cat VERSION)
 dotnet tool install --global wix
 
 # add required wix extension
-wix extension add WixToolset.Ui.wixex
+wix extension add WixToolset.UI.wixext
 
 # build the installer
-wix build -pdbtype none -arch x64 -d PackageVersion=$VERSION main.wxs -o halloy-installer.msi -ext ./.wix/extensions/WixToolset.Ui.wixext/5.0.1/wixext5/WixToolset.UI.wixext.dll
+wix build -pdbtype none -arch x64 -d PackageVersion=$VERSION $WXS_FILE -o halloy-installer.msi -ext WixToolset.UI.wixext
\ No newline at end of file
diff --git a/wix/main.wxs b/wix/main.wxs
index 38c0a8b88..e28901fdd 100644
--- a/wix/main.wxs
+++ b/wix/main.wxs
@@ -76,9 +76,9 @@
           <Custom Action="LaunchApp" Before="InstallFinalize"/>
         </InstallExecuteSequence>
 
-        <WixVariable Id="WixUILicenseRtf" Value="license.rtf"/>
-        <WixVariable Id="WixUIDialogBmp" Value="dialog.png"/>
-        <WixVariable Id="WixUIBannerBmp" Value="banner.png"/>
+        <WixVariable Id="WixUILicenseRtf" Value="wix/license.rtf"/>
+        <WixVariable Id="WixUIDialogBmp" Value="wix/dialog.png"/>
+        <WixVariable Id="WixUIBannerBmp" Value="wix/banner.png"/>
 
         <ui:WixUI Id="WixUI_InstallDir" InstallDirectory="INSTALLFOLDER" />
     </Package>