This commit is contained in:
Branislav Stojkovic
2025-03-07 16:47:34 +01:00
parent d460d0b1db
commit e7e9e889e1
3 changed files with 28 additions and 20 deletions
+5 -13
View File
@@ -34,22 +34,13 @@
<mkdir dir="${appdir}/usr/share/metainfo" /> <mkdir dir="${appdir}/usr/share/metainfo" />
<!-- Copy app files --> <!-- Copy app files -->
<zipfileset dir="${jar.dir}" includes="diylc.jar" /> <copy file="${jar.dir}/diylc.jar" todir="${appdir}/usr/lib" />
<zipfileset dir="${jar.dir}/lib" prefix="lib" /> <copy todir="${appdir}/usr/lib/lib">
<zipfileset dir="${jar.dir}/library/" prefix="library" />
<zipfileset dir="templates" prefix="templates" />
<zipfileset dir="themes" prefix="themes" />
<zipfileset dir="fonts" prefix="fonts" />
<zipfileset dir="lang" prefix="lang" />
<zipfileset dir="deploy" includes="splash.png" />
<copy file="${jar.dir}/diylc.jar" todir="${appdir}/usr/bin" />
<copy todir="${appdir}/usr/bin/lib">
<fileset dir="${jar.dir}/lib"> <fileset dir="${jar.dir}/lib">
<include name="*"/> <include name="*"/>
</fileset> </fileset>
</copy> </copy>
<copy todir="${appdir}/usr/bin/library"> <copy todir="${appdir}/usr/lib/library">
<fileset dir="${jar.dir}/library"> <fileset dir="${jar.dir}/library">
<include name="*"/> <include name="*"/>
</fileset> </fileset>
@@ -74,7 +65,8 @@
<include name="*"/> <include name="*"/>
</fileset> </fileset>
</copy> </copy>
<copy file="appimage/diylc.sh" tofile="${appdir}/AppRun" /> <copy file="appimage/diylc.sh" tofile="${appdir}/usr/bin/diylc.sh" />
<copy file="appimage/AppRun" tofile="${appdir}/AppRun" />
<copy file="deploy/splash.png" todir="${appdir}/usr/bin" /> <copy file="deploy/splash.png" todir="${appdir}/usr/bin" />
<chmod file="${appdir}/AppRun" perm="755" /> <chmod file="${appdir}/AppRun" perm="755" />
+4
View File
@@ -0,0 +1,4 @@
#!/bin/bash
HERE="$(dirname "$(readlink -f "$0")")"
exec "$HERE/usr/bin/diylc.sh" "$@"
+19 -7
View File
@@ -1,13 +1,25 @@
#!/bin/bash #!/bin/bash
HERE="$(dirname "$(readlink -f "$0")")" HERE="$(dirname \"$(readlink -f \"$0\")\")"
# Set JRE path inside AppImage # Set JRE path inside AppImage
if [ -d "$HERE/usr/lib/jre" ]; then if [ -d "$HERE/jre" ]; then
JAVA_HOME="$HERE/../lib/jre" export JAVA_HOME="$HERE/jre"
PATH="$JAVA_HOME/bin:$PATH" export PATH="$JAVA_HOME/bin:$PATH"
export JAVA_HOME PATH JAVA="$JAVA_HOME/bin/java"
else
JAVA="$(which java)"
fi fi
cd /usr/bin cd "$HERE"
exec "$JAVA_HOME/bin/java" -Xms512m -Xmx4096m -javaagent:lib/jar-loader.jar -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 -cp diylc.jar:lib --add-exports java.desktop/com.apple.eawt.event=ALL-UNNAMED --add-exports java.desktop/com.apple.eio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens java.desktop/java.awt.geom=ALL-UNNAMED org.diylc.DIYLCStarter "$@" exec "$JAVA" \
-javaagent:"$HERE/../lib/lib/jar-loader.jar" \
-Xms128m \
-Xmx4096m \
-cp "$HERE/../lib/diylc.jar:$HERE/../lib/lib/*" \
--add-exports java.desktop/com.apple.eawt.event=ALL-UNNAMED \
--add-exports java.desktop/com.apple.eio=ALL-UNNAMED \
--add-opens java.base/java.util=ALL-UNNAMED \
--add-opens java.base/java.lang=ALL-UNNAMED \
--add-opens java.base/java.util=ALL-UNNAMED \
org.diylc.DIYLCStarter "$@"