From ec9209ceb6389fdb37c064d6d3b6a8ff3b9bf852 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Mon, 21 Oct 2024 20:35:24 +0800
Subject: [PATCH] update permission, include shell script to archive

---
 forge-gui-android/src/main/AndroidManifest.xml |  2 ++
 forge-installer/pom.xml                        | 12 +++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/forge-gui-android/src/main/AndroidManifest.xml b/forge-gui-android/src/main/AndroidManifest.xml
index 286a2d50c42..cb4a7fa028b 100644
--- a/forge-gui-android/src/main/AndroidManifest.xml
+++ b/forge-gui-android/src/main/AndroidManifest.xml
@@ -5,6 +5,8 @@
     <uses-sdk
         android:minSdkVersion="26"
         android:targetSdkVersion="35" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <!-- This one needs Android Runtime Permission for Android 6+ -->
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
diff --git a/forge-installer/pom.xml b/forge-installer/pom.xml
index 18bc8924d7c..40604fff99b 100644
--- a/forge-installer/pom.xml
+++ b/forge-installer/pom.xml
@@ -160,6 +160,7 @@
                                         <!-- 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" />
@@ -179,10 +180,12 @@
                                             <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" />
@@ -190,10 +193,13 @@
                                         </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" />
@@ -209,15 +215,15 @@
                                         <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.sh" />
                                                 <include name="forge.command" />
                                                 <include name="forge.cmd" />
                                                 <include name="forge.exe" />
-                                                <exclude name="forge-adventure.sh" />
+                                                <include name="forge-adventure.sh" />
                                                 <include name="forge-adventure.command" />
                                                 <include name="forge-adventure.cmd" />
                                                 <include name="forge-adventure.exe" />
-                                                <exclude name="adventure-editor.sh" />
+                                                <include name="adventure-editor.sh" />
                                                 <include name="adventure-editor.command" />
                                                 <include name="adventure-editor.cmd" />
                                                 <include name="adventure-editor.exe" />