summaryrefslogtreecommitdiff
path: root/pdf-over-gui/src/main/resources
diff options
context:
space:
mode:
authorJakob Heher <jakob.heher@iaik.tugraz.at>2022-03-22 13:52:29 +0100
committerJakob Heher <jakob.heher@iaik.tugraz.at>2022-03-22 13:52:29 +0100
commit0953f7cde8a2c09850f398790adc983ebf7f1b8b (patch)
tree60215d314905a71c545ff637061bb945f2eeee5f /pdf-over-gui/src/main/resources
parent5cc1081113429add3b70887b47b4be4b8da8cf69 (diff)
downloadpdf-over-0953f7cde8a2c09850f398790adc983ebf7f1b8b.tar.gz
pdf-over-0953f7cde8a2c09850f398790adc983ebf7f1b8b.tar.bz2
pdf-over-0953f7cde8a2c09850f398790adc983ebf7f1b8b.zip
sanitize swt handling
Diffstat (limited to 'pdf-over-gui/src/main/resources')
-rw-r--r--pdf-over-gui/src/main/resources/izpack/install.xml8
-rw-r--r--pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh1
-rw-r--r--pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh1
-rw-r--r--pdf-over-gui/src/main/resources/scripts/pdf-over_win-cli.bat1
-rw-r--r--pdf-over-gui/src/main/resources/scripts/pdf-over_win.bat1
-rw-r--r--pdf-over-gui/src/main/resources/scripts/postInstall_linux.sh4
-rw-r--r--pdf-over-gui/src/main/resources/scripts/postInstall_win.bat2
-rw-r--r--pdf-over-gui/src/main/resources/scripts/postinstall_mac.sh1
8 files changed, 0 insertions, 19 deletions
diff --git a/pdf-over-gui/src/main/resources/izpack/install.xml b/pdf-over-gui/src/main/resources/izpack/install.xml
index 457fb083..f07da7ef 100644
--- a/pdf-over-gui/src/main/resources/izpack/install.xml
+++ b/pdf-over-gui/src/main/resources/izpack/install.xml
@@ -57,10 +57,8 @@
<description>Main Installation</description>
<updatecheck>
<include name="lib/**" />
- <include name="lib-swt/**" />
</updatecheck>
<file src="lib" targetdir="$INSTALL_PATH" />
- <file src="lib-swt" targetdir="$INSTALL_PATH" />
<file src="scripts" targetdir="$INSTALL_PATH" />
<file src="icons" targetdir="$INSTALL_PATH" />
<file src="ReadMe.txt" targetdir="$INSTALL_PATH" />
@@ -71,8 +69,6 @@
os="unix" stage="never"></executable>
<executable targetfile="$INSTALL_PATH/scripts/uninstall_linux.sh"
os="unix" stage="never"></executable>
- <executable targetfile="$INSTALL_PATH/lib/pdf-over-install-helper.jar"
- os="unix" stage="never"></executable>
<executable targetfile="$INSTALL_PATH/scripts/pdf-over_win.bat"
os="windows" stage="never"></executable>
<executable targetfile="$INSTALL_PATH/scripts/pdf-over_win-cli.bat"
@@ -81,12 +77,8 @@
os="windows" stage="never"></executable>
<executable targetfile="$INSTALL_PATH/scripts/pdf-over_mac.sh"
os="mac" stage="never"></executable>
-<!-- <executable targetfile="$INSTALL_PATH/scripts/postInstall_linux.sh"
- os="unix" stage="postinstall" ></executable>-->
<executable targetfile="$INSTALL_PATH/scripts/postinstall_mac.sh"
os="mac" stage="postinstall"></executable>
-<!-- <executable targetfile="$INSTALL_PATH/scripts/postInstall_win.bat"
- os="win" stage="postinstall" ></executable> -->
</pack>
</packs>
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 438cec28..ca4e6279 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,5 +1,4 @@
#!/bin/sh
BASEDIR=`dirname $0`
export GDK_BACKEND=X11
-java -jar "$BASEDIR/../lib/pdf-over-install-helper.jar"
exec java -cp "$BASEDIR/../lib/*" at.asit.pdfover.gui.Main "$@"
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 2c488544..dcb805ae 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,5 +1,4 @@
#!/bin/sh
BASEDIR=$(cd "$(dirname "$0")"; pwd)
export LC_CTYPE="UTF-8"
-#java -jar "$BASEDIR/../lib/pdf-over-install-helper.jar"
exec java -XstartOnFirstThread -cp "$BASEDIR/../lib/*" at.asit.pdfover.gui.Main "$@" &
diff --git a/pdf-over-gui/src/main/resources/scripts/pdf-over_win-cli.bat b/pdf-over-gui/src/main/resources/scripts/pdf-over_win-cli.bat
index fe9bad65..fb7b7c39 100644
--- a/pdf-over-gui/src/main/resources/scripts/pdf-over_win-cli.bat
+++ b/pdf-over-gui/src/main/resources/scripts/pdf-over_win-cli.bat
@@ -1,4 +1,3 @@
@echo off
-start /b javaw -jar "%~dp0\..\lib\pdf-over-install-helper.jar"
start /b /WAIT java -cp "%~dp0\..\lib\*" at.asit.pdfover.gui.Main %*
diff --git a/pdf-over-gui/src/main/resources/scripts/pdf-over_win.bat b/pdf-over-gui/src/main/resources/scripts/pdf-over_win.bat
index 5e336241..6468e582 100644
--- a/pdf-over-gui/src/main/resources/scripts/pdf-over_win.bat
+++ b/pdf-over-gui/src/main/resources/scripts/pdf-over_win.bat
@@ -1,3 +1,2 @@
@echo off
-start /b javaw -jar "%~dp0\..\lib\pdf-over-install-helper.jar"
start /b javaw -cp "%~dp0\..\lib\*" at.asit.pdfover.gui.Main %*
diff --git a/pdf-over-gui/src/main/resources/scripts/postInstall_linux.sh b/pdf-over-gui/src/main/resources/scripts/postInstall_linux.sh
deleted file mode 100644
index 7c8d9cf5..00000000
--- a/pdf-over-gui/src/main/resources/scripts/postInstall_linux.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-BASEDIR=`dirname $0`
-java -jar "$BASEDIR/../lib/pdf-over-install-helper.jar"
-
diff --git a/pdf-over-gui/src/main/resources/scripts/postInstall_win.bat b/pdf-over-gui/src/main/resources/scripts/postInstall_win.bat
deleted file mode 100644
index 78deb870..00000000
--- a/pdf-over-gui/src/main/resources/scripts/postInstall_win.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-java -jar "%~dp0\..\lib\pdf-over-install-helper.jar"
diff --git a/pdf-over-gui/src/main/resources/scripts/postinstall_mac.sh b/pdf-over-gui/src/main/resources/scripts/postinstall_mac.sh
index 82e1add9..0b020ea3 100644
--- a/pdf-over-gui/src/main/resources/scripts/postinstall_mac.sh
+++ b/pdf-over-gui/src/main/resources/scripts/postinstall_mac.sh
@@ -3,7 +3,6 @@ SCRIPTDIR=$(cd "$(dirname "$0")"; pwd)
BASEDIR=$(cd "$(dirname "$0")/.."; pwd)
export LC_CTYPE="UTF-8"
cd "$SCRIPTDIR"
-java -jar "$BASEDIR/lib/pdf-over-install-helper.jar"
chmod a+x pdf-over_mac.sh
cd "$BASEDIR"
if [ -d "$BASEDIR.app" ]; then