clean up

.github/workflows/build.yml

@@ -458,7 +458,7 @@ jobs:
           --resource-dir dist/win/resources
           --license-file dist/win/resources/license.rtf
         env:
-          JpackageWixWizardResources: ${{ github.workspace }}/dist/win/resources # seems to require an abs path?
+          JP_WIXWIZARD_RESOURCES: ${{ github.workspace }}/dist/win/resources # requires abs path, used in resources/main.wxs
       - name: Codesign MSI
         uses: skymatic/code-sign-action@v1.1.0
         with:

dist/win/resources/main.wxs

@@ -83,9 +83,10 @@
       </Dialog>
 
       <!--
-        Run WixUI_InstallDir dialog in the default install directory.
+        Run our custom wizard in the default install directory.
       -->
       <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>
+      <!-- included at the end -->
       <UIRef Id="CustomWizard" />
 
       <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="JpCheckInstallDir" Order="3">1</Publish>
@@ -126,9 +127,9 @@
       <RemoveExistingProducts Before="CostInitialize"/>
     </InstallExecuteSequence>
 
-    <WixVariable Id="WixUIBannerBmp" Value="$(env.JpackageWixWizardResources)\banner.bmp" />
-    <WixVariable Id="WixUIDialogBmp" Value="$(env.JpackageWixWizardResources)\background.bmp" />
+    <WixVariable Id="WixUIBannerBmp" Value="$(env.JP_WIXWIZARD_RESOURCES)\banner.bmp" />
+    <WixVariable Id="WixUIDialogBmp" Value="$(env.JP_WIXWIZARD_RESOURCES)\background.bmp" />
   </Product>
 
-  <?include $(env.JpackageWixWizardResources)\customWizard.wxi ?>
+  <?include $(env.JP_WIXWIZARD_RESOURCES)\customWizard.wxi ?>
 </Wix>