From 9cb652eaab01f61711cb67554f0bfdfa8f6f841e Mon Sep 17 00:00:00 2001
From: Jakob Heher <jakob.heher@iaik.tugraz.at>
Date: Wed, 4 May 2022 15:12:36 +0200
Subject: bundle JRE on linux

---
 pdf-over-gui/src/main/resources/izpack-linux/install.xml  | 3 +++
 pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'pdf-over-gui/src')

diff --git a/pdf-over-gui/src/main/resources/izpack-linux/install.xml b/pdf-over-gui/src/main/resources/izpack-linux/install.xml
index 1e95e93a..8df8b3a7 100644
--- a/pdf-over-gui/src/main/resources/izpack-linux/install.xml
+++ b/pdf-over-gui/src/main/resources/izpack-linux/install.xml
@@ -58,6 +58,9 @@
 				<include name="lib/**" />
 			</updatecheck>
 			<fileset dir="lib" targetdir="$INSTALL_PATH/lib" />
+			<file src="${pdfover-build.bundled-jre.archive-filename}" targetdir="$INSTALL_PATH/jre" unpack="true">
+				<archivefileset dir="${pdfover-build.bundled-jre.folder-in-archive}" />
+			</file>
 			<file src="pdf-over_linux.sh" targetdir="$INSTALL_PATH" />
 			<file src="uninstall_linux.sh" targetdir="$INSTALL_PATH" />
 			<file src="icons" targetdir="$INSTALL_PATH" />
diff --git a/pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh b/pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh
index c79726df..6736aa15 100644
--- a/pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh
+++ b/pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 BASEDIR=`dirname $0`
-exec java -cp "$BASEDIR/lib/*" at.asit.pdfover.gui.Main "$@"
+exec $BASEDIR/jre/bin/java -cp "$BASEDIR/lib/*" at.asit.pdfover.gui.Main "$@"
-- 
cgit v1.2.3