From 03cb5f6be96df80a9989061a094dba67af329a69 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 28 Apr 2026 18:23:44 +0200
Subject: [PATCH] Closes #4219

---
 dist/win/build.ps1                                 | 10 ++++++++--
 dist/win/resources/FAvaultFile.properties          |  2 +-
 dist/win/resources/FAvaultFile.template.properties |  4 ++++
 dist/win/resources/main.wxs                        |  4 ++--
 4 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 dist/win/resources/FAvaultFile.template.properties

diff --git a/dist/win/build.ps1 b/dist/win/build.ps1
index d9656d1f5..b192129d5 100644
--- a/dist/win/build.ps1
+++ b/dist/win/build.ps1
@@ -227,8 +227,14 @@ attrib -r "$AppName\$AppName.exe"
 attrib -r "$AppName\${AppName} (Debug).exe"
 
 # create .msi
-$Env:JP_WIXWIZARD_RESOURCES = "$buildDir\resources"
-$Env:JP_WIXHELPER_DIR = "."
+$Env:JP_WIXWIZARD_RESOURCES = "$buildDir\resources\"
+$Env:JP_WIXWIZARD_RESOURCES_PROPERTIES_FORMAT = "${Env:JP_WIXWIZARD_RESOURCES}".Replace('\', '\\');
+$Env:JP_WIXHELPER_DIR = ""
+
+Get-Content .\resources\FAvaultFile.template.properties `
+    | ForEach-Object { $ExecutionContext.InvokeCommand.ExpandString($_) } `
+    | Out-File -FilePath .\resources\FAvaultFile.properties
+
 Invoke-CommandWithExitCheck -Command `
     "$Env:JAVA_HOME\bin\jpackage" -Arguments @(
     "--verbose",
diff --git a/dist/win/resources/FAvaultFile.properties b/dist/win/resources/FAvaultFile.properties
index 4d0284e69..e35841acf 100644
--- a/dist/win/resources/FAvaultFile.properties
+++ b/dist/win/resources/FAvaultFile.properties
@@ -1,4 +1,4 @@
 mime-type=application/vnd.cryptomator.vault
 extension=cryptomator
 description=Cryptomator Vault File
-icon=resources/Cryptomator-Vault.ico
\ No newline at end of file
+icon=C:\\Users\\Arbeit\\Skymatic\\cryptomator-jdk26-jpackage\\dist\\win\\resources\\Cryptomator-Vault.ico
diff --git a/dist/win/resources/FAvaultFile.template.properties b/dist/win/resources/FAvaultFile.template.properties
new file mode 100644
index 000000000..39640a9ec
--- /dev/null
+++ b/dist/win/resources/FAvaultFile.template.properties
@@ -0,0 +1,4 @@
+mime-type=application/vnd.cryptomator.vault
+extension=cryptomator
+description=Cryptomator Vault File
+icon=${env:JP_WIXWIZARD_RESOURCES_PROPERTIES_FORMAT}Cryptomator-Vault.ico
\ No newline at end of file
diff --git a/dist/win/resources/main.wxs b/dist/win/resources/main.wxs
index 5ec5bcbee..86afe3079 100644
--- a/dist/win/resources/main.wxs
+++ b/dist/win/resources/main.wxs
@@ -225,7 +225,7 @@
       <ns0:Custom Action="JpFindRelatedProducts" After="FindRelatedProducts"/>
     </ns0:InstallUISequence>
 
-    <ns0:WixVariable Id="WixUIBannerBmp" Value="$(env.JP_WIXWIZARD_RESOURCES)\banner.bmp" />
-    <ns0:WixVariable Id="WixUIDialogBmp" Value="$(env.JP_WIXWIZARD_RESOURCES)\background.bmp" />
+    <ns0:WixVariable Id="WixUIBannerBmp" Value="$(env.JP_WIXWIZARD_RESOURCES)banner.bmp" />
+    <ns0:WixVariable Id="WixUIDialogBmp" Value="$(env.JP_WIXWIZARD_RESOURCES)background.bmp" />
   </ns0:Package>
 </ns0:Wix>