From 9199bd9655f918369a77b61ed4b596698d8cab89 Mon Sep 17 00:00:00 2001
From: Bane Stojkovic <bancika@gmail.com>
Date: Fri, 7 Mar 2025 15:18:23 +0100
Subject: [PATCH] Update diylc.sh (#886)

* Update diylc.sh

* Update appimage.xml (#887)
---
 diylc/diylc-swing/appimage.xml      | 4 ++--
 diylc/diylc-swing/appimage/diylc.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/diylc/diylc-swing/appimage.xml b/diylc/diylc-swing/appimage.xml
index 64dc516e..07bb84af 100644
--- a/diylc/diylc-swing/appimage.xml
+++ b/diylc/diylc-swing/appimage.xml
@@ -53,9 +53,9 @@
 				<include name="*"/>
 			</fileset>
 		</copy>
-		<copy file="appimage/diylc.sh" tofile="${appdir}/usr/bin/diylc" />
+		<copy file="appimage/diylc.sh" tofile="${appdir}/AppRun" />
 		<copy file="deploy/splash.png" todir="${appdir}/usr/bin" />
-		<chmod file="${appdir}/usr/bin/diylc" perm="755" />
+		<chmod file="${appdir}/AppRun" perm="755" />
 
 		<!-- Copy icons and desktop file -->
 		<copy file="icons/icon_512x512.png" tofile="${appdir}/usr/share/icons/hicolor/512x512/apps/com.diy_fever.DIYLayoutCreator.png" />
diff --git a/diylc/diylc-swing/appimage/diylc.sh b/diylc/diylc-swing/appimage/diylc.sh
index f0578418..3bfc8323 100644
--- a/diylc/diylc-swing/appimage/diylc.sh
+++ b/diylc/diylc-swing/appimage/diylc.sh
@@ -2,10 +2,10 @@
 HERE="$(dirname "$(readlink -f "$0")")"
 
 # Set JRE path inside AppImage
-if [ -d "$HERE/../lib/jre" ]; then
+if [ -d "$HERE/usr/lib/jre" ]; then
     JAVA_HOME="$HERE/../lib/jre"
     PATH="$JAVA_HOME/bin:$PATH"
     export JAVA_HOME PATH
 fi
 
-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 "$@"
\ No newline at end of file
+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 "$@"