From e896bfd983089afec35f0f6d556131e7215a78da Mon Sep 17 00:00:00 2001
From: Jakob Heher <jakob.heher@iaik.tugraz.at>
Date: Mon, 4 Apr 2022 16:47:04 +0200
Subject: move scripts to main pdfover directory, closes #82

---
 pdf-over-gui/src/main/resources/izpack/install.xml      | 13 ++++++++-----
 pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

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

diff --git a/pdf-over-gui/src/main/resources/izpack/install.xml b/pdf-over-gui/src/main/resources/izpack/install.xml
index 1de49f55..92f15dad 100644
--- a/pdf-over-gui/src/main/resources/izpack/install.xml
+++ b/pdf-over-gui/src/main/resources/izpack/install.xml
@@ -58,20 +58,23 @@
 				<include name="lib/**" />
 			</updatecheck>
 			<file src="lib" targetdir="$INSTALL_PATH" />
-			<file src="scripts" targetdir="$INSTALL_PATH" />
+			<file src="scripts/pdf-over_linux.sh" targetdir="$INSTALL_PATH" os="unix" />
+			<file src="scripts/uninstall_linux.sh" targetdir="$INSTALL_PATH" os="unix" />
+			<file src="scripts/pdf-over_mac.sh" targetdir="$INSTALL_PATH" os="mac" />
+			<file src="scripts/postinstall_mac.sh" targetdir="$INSTALL_PATH" os="mac" />
 			<file src="icons" targetdir="$INSTALL_PATH" />
 			<file src="ReadMe.txt" targetdir="$INSTALL_PATH" />
 			<file src="jre/${bundled-jre.archiveName}" targetdir="$INSTALL_PATH/jre" os="windows" unpack="true" />
 			<file src="PDF-Over.exe" targetdir="$INSTALL_PATH" os="windows"/>
 			<file src="PDF-Over-cli.exe" targetdir="$INSTALL_PATH" os="windows"/>
 			<file src="Uninstaller.exe" targetdir="$INSTALL_PATH/Uninstaller" os="windows"/>
-            <executable targetfile="$INSTALL_PATH/scripts/pdf-over_linux.sh"
+            <executable targetfile="$INSTALL_PATH/pdf-over_linux.sh"
 				os="unix" stage="never"></executable>
-			<executable targetfile="$INSTALL_PATH/scripts/uninstall_linux.sh"
+			<executable targetfile="$INSTALL_PATH/uninstall_linux.sh"
 				os="unix" stage="never"></executable>
-			<executable targetfile="$INSTALL_PATH/scripts/pdf-over_mac.sh"
+			<executable targetfile="$INSTALL_PATH/pdf-over_mac.sh"
 				os="mac" stage="never"></executable>
-			<executable targetfile="$INSTALL_PATH/scripts/postinstall_mac.sh"
+			<executable targetfile="$INSTALL_PATH/postinstall_mac.sh"
 				os="mac" stage="postinstall"></executable>
 		</pack>
 	</packs>
diff --git a/pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh b/pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh
index dcb805ae..7c923463 100644
--- a/pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh
+++ b/pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 BASEDIR=$(cd "$(dirname "$0")"; pwd)
 export LC_CTYPE="UTF-8"
-exec java -XstartOnFirstThread -cp "$BASEDIR/../lib/*" at.asit.pdfover.gui.Main "$@" &
+exec java -XstartOnFirstThread -cp "$BASEDIR/lib/*" at.asit.pdfover.gui.Main "$@" &
-- 
cgit v1.2.3