From fbf26efc605ceeaee1929589fd2fb859fb3b7553 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Mon, 21 Oct 2024 19:35:23 +0800
Subject: [PATCH] update installer, restore the tar.bz2 archive along with the
 installer and try to grant permission on the shell executables.

---
 .github/workflows/snapshots-pc.yml |  9 +++++++--
 forge-installer/libs/install.xml   | 23 +++++++++++++++++++--
 forge-installer/pom.xml            | 32 ++++++++++++++++--------------
 3 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/snapshots-pc.yml b/.github/workflows/snapshots-pc.yml
index 6502de34b18..b125797e69b 100644
--- a/.github/workflows/snapshots-pc.yml
+++ b/.github/workflows/snapshots-pc.yml
@@ -58,10 +58,15 @@ jobs:
           mkdir izpack
           # If this works just gotta figure out how to append datetime
           mv /home/runner/.m2/repository/forge/forge-installer/*/*.jar izpack/
+          mv /home/runner/.m2/repository/forge/forge-installer/*/*.bz2 izpack/
           cd izpack
-          out="$(basename -s .jar *)"
           d=$(date +%m.%d)
-          mv "${out}.jar" "${out}-${d}.jar"
+          # rename installer
+          outj="$(basename -s .jar *)"
+          mv "${outj}.jar" "${outj}-${d}.jar"
+          # rename archive
+          outb="$(basename -s .tar.bz2 *)"
+          mv "${outb}.tar.bz2" "${outb}-${d}.tar.bz2"
 
       - name: 📂 Sync files
         uses: SamKirkland/FTP-Deploy-Action@v4.3.4
diff --git a/forge-installer/libs/install.xml b/forge-installer/libs/install.xml
index 22514262e1b..e3c6d98da1e 100644
--- a/forge-installer/libs/install.xml
+++ b/forge-installer/libs/install.xml
@@ -30,6 +30,10 @@
         <langpack iso3="eng"/>
     </locale>
 
+	<listeners>
+        <listener classname="ChmodInstallerListener" stage="install"/>
+    </listeners>
+
     <resources>
 	    <res id="packsLang.xml" src="eng.xml"/>
         <res id="CustomLangPack.xml_eng" src="eng.xml"/>
@@ -55,9 +59,24 @@
     </panels>
 
     <packs>
-		<pack name="forge.zip" required="yes" preselected="yes" hidden="false">
+		<pack name="Forge pack" required="yes" preselected="yes" hidden="false">
 			<description>An archive that contains updated Forge application.</description>
-			<file src="forge.zip" targetdir="$INSTALL_PATH/" override="true" unpack="true"/>
+			<file src="$project.build.finalName$.tar.bz2" targetdir="$INSTALL_PATH/" override="true" unpack="true"/>
+		</pack>
+		<pack name="Script pack" required="yes" preselected="yes">
+			<description>Linux/Unix executables to install with permission if able. Grant permission manually if the installer failed to access permission.</description>
+			<file src="forge.sh" targetdir="$INSTALL_PATH/" override="true">
+				<additionaldata key="permission.file" value="775"/>
+			</file>
+			<file src="forge-adventure.sh" targetdir="$INSTALL_PATH/" override="true">
+				<additionaldata key="permission.file" value="775"/>
+			</file>
+			<file src="adventure-editor.sh" targetdir="$INSTALL_PATH/" override="true">
+				<additionaldata key="permission.file" value="775"/>
+			</file>
+			<executable stage="never" failure ="ignore" keep="true">
+				<fileset targetdir="$INSTALL_PATH/" includes="forge.sh,forge-adventure.sh,adventure-editor.sh" />
+			</executable>
 		</pack>
     </packs>
 </izpack:installation>
\ No newline at end of file
diff --git a/forge-installer/pom.xml b/forge-installer/pom.xml
index f558649fc64..18bc8924d7c 100644
--- a/forge-installer/pom.xml
+++ b/forge-installer/pom.xml
@@ -160,7 +160,6 @@
                                         <!-- Windows/Linux archive -->
                                         <mkdir dir="${project.build.directory}/${project.build.finalName}" />
                                         <copy todir="${project.build.directory}/${project.build.finalName}">
-                                            <fileset dir="${project.build.directory}/../../forge-gui-desktop/target" includes="forge.sh" />
                                             <fileset dir="${project.build.directory}/../../forge-gui-desktop/target" includes="forge.command" />
                                             <fileset dir="${project.build.directory}/../../forge-gui-desktop/target" includes="forge.cmd" />
                                             <fileset dir="${basedir}/../forge-gui/" includes="forge.profile.properties.example" />
@@ -180,12 +179,10 @@
                                             <fileset dir="${project.build.directory}/../../forge-gui-desktop/target" includes="forge.exe" />
                                             <fileset dir="${project.build.directory}/../../adventure-editor/tools" includes="gdx-particle-editor.jar" />
                                             <fileset dir="${project.build.directory}/../../adventure-editor/target" includes="adventure-editor.exe" />
-                                            <fileset dir="${project.build.directory}/../../adventure-editor/target" includes="adventure-editor.sh" />
                                             <fileset dir="${project.build.directory}/../../adventure-editor/target" includes="adventure-editor.command" />
                                             <fileset dir="${project.build.directory}/../../adventure-editor/target" includes="adventure-editor.cmd" />
                                             <fileset dir="${project.build.directory}/../../adventure-editor/target" includes="adventure-editor-jar-with-dependencies.jar" />
                                             <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.exe" />
-                                            <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.sh" />
                                             <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.command" />
                                             <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.cmd" />
                                             <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-gui-mobile-dev-${project.version}-jar-with-dependencies.jar" />
@@ -193,34 +190,39 @@
                                         </copy>
                                         <mkdir dir="${project.build.directory}/${project.build.finalName}/res/cardsfolder" />
                                         <zip destfile="${project.build.directory}/${project.build.finalName}/res/cardsfolder/cardsfolder.zip" basedir="${basedir}/../forge-gui/res/cardsfolder" level="1" />
-                                        <chmod file="${project.build.directory}/${project.build.finalName}/forge.sh" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge.command" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge.cmd" perm="a+rx" />
-                                        <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.sh" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.command" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.cmd" perm="a+rx" />
-                                        <chmod file="${project.build.directory}/${project.build.finalName}/adventure-editor.sh" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/adventure-editor.command" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/adventure-editor.cmd" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge.exe" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.exe" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/adventure-editor.exe" perm="a+rx" />
-                                        <zip destfile="${basedir}/target/forge.zip">
-                                            <zipfileset filemode="755" dir="${project.build.directory}/${project.build.finalName}">
-                                                <include name="forge.sh" />
+                                        <copy todir="${basedir}/target">
+                                            <fileset dir="${project.build.directory}/../../forge-gui-desktop/target" includes="forge.sh" />
+                                            <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.sh" />
+                                            <fileset dir="${project.build.directory}/../../adventure-editor/target" includes="adventure-editor.sh" />
+                                        </copy>
+                                        <chmod file="${basedir}/target/forge.sh" perm="a+rx" />
+                                        <chmod file="${basedir}/target/forge-adventure.sh" perm="a+rx" />
+                                        <chmod file="${basedir}/target/adventure-editor.sh" perm="a+rx" />
+                                        <tar destfile="${basedir}/target/${project.build.finalName}.tar.bz2" compression="bzip2">
+                                            <tarfileset filemode="755" dir="${project.build.directory}/${project.build.finalName}">
+                                                <exclude name="forge.sh" />
                                                 <include name="forge.command" />
                                                 <include name="forge.cmd" />
                                                 <include name="forge.exe" />
-                                                <include name="forge-adventure.sh" />
+                                                <exclude name="forge-adventure.sh" />
                                                 <include name="forge-adventure.command" />
                                                 <include name="forge-adventure.cmd" />
                                                 <include name="forge-adventure.exe" />
-                                                <include name="adventure-editor.sh" />
+                                                <exclude name="adventure-editor.sh" />
                                                 <include name="adventure-editor.command" />
                                                 <include name="adventure-editor.cmd" />
                                                 <include name="adventure-editor.exe" />
-                                            </zipfileset>
-                                            <zipfileset dir="${project.build.directory}/${project.build.finalName}">
+                                            </tarfileset>
+                                            <tarfileset dir="${project.build.directory}/${project.build.finalName}">
                                                 <include name="**" />
                                                 <exclude name="forge.sh" />
                                                 <exclude name="forge.command" />
@@ -234,8 +236,8 @@
                                                 <exclude name="adventure-editor.command" />
                                                 <exclude name="adventure-editor.cmd" />
                                                 <exclude name="adventure-editor.exe" />
-                                            </zipfileset>
-                                        </zip>
+                                            </tarfileset>
+                                        </tar>
                                     </target>
                                 </configuration>
                                 <goals>