From c404a54a5c853d650cd92b0d029fe4ea4faa8840 Mon Sep 17 00:00:00 2001
From: Mahor Foruzesh <mahorforuzesh@pm.me>
Date: Sat, 22 Jan 2022 10:05:29 +0330
Subject: [PATCH] Improve windows-bundler.sh

---
 .../msi/tachidesk-server-x64.wxs}                  |  2 +-
 .../msi/tachidesk-server-x86.wxs}                  |  2 +-
 scripts/windows-bundler.sh                         | 14 ++++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)
 rename scripts/{Tachidesk-Server-x64.wxs => resources/msi/tachidesk-server-x64.wxs} (97%)
 rename scripts/{Tachidesk-Server-x86.wxs => resources/msi/tachidesk-server-x86.wxs} (97%)

diff --git a/scripts/Tachidesk-Server-x64.wxs b/scripts/resources/msi/tachidesk-server-x64.wxs
similarity index 97%
rename from scripts/Tachidesk-Server-x64.wxs
rename to scripts/resources/msi/tachidesk-server-x64.wxs
index e3dd34df7d..36f160801f 100755
--- a/scripts/Tachidesk-Server-x64.wxs
+++ b/scripts/resources/msi/tachidesk-server-x64.wxs
@@ -80,7 +80,7 @@
       <ComponentRef Id="TachideskElectronBAT" />
     </Feature>
 
-    <Icon Id="Tachidesk.ico" SourceFile="../server/src/main/resources/icon/faviconlogo.ico" />
+    <Icon Id="Tachidesk.ico" SourceFile="$(var.Icon)" />
     <Property Id="ARPPRODUCTICON" Value="Tachidesk.ico" /> <!-- Icon in Add/Remove Programs -->
   </Product>
 </Wix>
diff --git a/scripts/Tachidesk-Server-x86.wxs b/scripts/resources/msi/tachidesk-server-x86.wxs
similarity index 97%
rename from scripts/Tachidesk-Server-x86.wxs
rename to scripts/resources/msi/tachidesk-server-x86.wxs
index a0aa42068a..0d736fe864 100755
--- a/scripts/Tachidesk-Server-x86.wxs
+++ b/scripts/resources/msi/tachidesk-server-x86.wxs
@@ -76,7 +76,7 @@
       <ComponentRef Id="TachideskElectronBAT" />
     </Feature>
 
-    <Icon Id="Tachidesk.ico" SourceFile="../server/src/main/resources/icon/faviconlogo.ico" />
+    <Icon Id="Tachidesk.ico" SourceFile="$(var.Icon)" />
     <Property Id="ARPPRODUCTICON" Value="Tachidesk.ico" /> <!-- Icon in Add/Remove Programs -->
   </Product>
 </Wix>
diff --git a/scripts/windows-bundler.sh b/scripts/windows-bundler.sh
index 65939fa7eb..ba46fe99c2 100755
--- a/scripts/windows-bundler.sh
+++ b/scripts/windows-bundler.sh
@@ -29,12 +29,10 @@ echo "creating windows bundle"
 jar=$(ls ../server/build/*.jar | tail -n1)
 jar_name=$(echo $jar | cut -d'/' -f4)
 release_name=$(echo $jar_name | sed 's/.jar//')-$arch
-release_ver=$(tmp=${jar%-*} && echo ${tmp##*-} | tr -d v)
 
 # make release dir
 mkdir $release_name
 
-
 echo "Dealing with jre..."
 if [ ! -f $jre ]; then
   curl -L $jre_url -o $jre
@@ -79,13 +77,17 @@ zip -9 -r $zip_name $release_name
 
 # create msi package
 msi_name=$release_name.msi
+release_ver=$(tmp=${jar%-*} && echo ${tmp##*-} | tr -d v)
+icon="../server/src/main/resources/icon/faviconlogo.ico"
 
-find $release_name/jre | wixl-heat --var var.SourceDir -p $release_name/ --directory-ref jre --component-group jre > jre.wxs
-find $release_name/electron | wixl-heat --var var.SourceDir -p $release_name/ --directory-ref electron --component-group electron > electron.wxs
+find $release_name/jre | wixl-heat --var var.SourceDir -p $release_name/ --directory-ref jre --component-group jre >jre.wxs
+find $release_name/electron | wixl-heat --var var.SourceDir -p $release_name/ --directory-ref electron --component-group electron >electron.wxs
 if [ $arch = "win32" ]; then
-  wixl -D ProductVersion=$release_ver -D SourceDir=$release_name --arch x86 Tachidesk-Server-x86.wxs jre.wxs electron.wxs -o $msi_name
+  wixl -D ProductVersion=$release_ver -D SourceDir=$release_name -D Icon=$icon \
+    --arch x86 resources/msi/tachidesk-server-x86.wxs jre.wxs electron.wxs -o $msi_name
 else
-  wixl -D ProductVersion=$release_ver -D SourceDir=$release_name --arch x64 Tachidesk-Server-x64.wxs jre.wxs electron.wxs -o $msi_name
+  wixl -D ProductVersion=$release_ver -D SourceDir=$release_name -D Icon=$icon \
+    --arch x64 resources/msi/tachidesk-server-x64.wxs jre.wxs electron.wxs -o $msi_name
 fi
 
 rm -rf $release_name