From 9d7fc4054d67b041d54f8e4da139ba55baffc845 Mon Sep 17 00:00:00 2001
From: Andreas Abraham <aabraham@iaik.tugraz.at>
Date: Wed, 21 Mar 2018 13:04:27 +0100
Subject: izpack install.xml changed

---
 pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java |  2 +-
 pdf-over-gui/src/main/resources/izpack/install.xml       | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java
index 2f5d5264..31128423 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java
@@ -35,7 +35,7 @@ public class Main {
 	 * SLF4J Logger instance
 	 **/
 	private static final Logger log = LoggerFactory.getLogger(Main.class);
-	private static URL url=null;
+//	private static URL url=null;
 
 	/**
 	 * @param args
diff --git a/pdf-over-gui/src/main/resources/izpack/install.xml b/pdf-over-gui/src/main/resources/izpack/install.xml
index 6a864b81..cea5d66b 100644
--- a/pdf-over-gui/src/main/resources/izpack/install.xml
+++ b/pdf-over-gui/src/main/resources/izpack/install.xml
@@ -4,8 +4,8 @@
 
 	<info>
 		<appname>PDF-Over</appname>
-		<appversion>4.1</appversion>
-		<javaversion>1.6</javaversion>
+		<appversion>4.17</appversion>
+		<javaversion>1.7</javaversion>
 		<authors>
 			<author name="A-SIT (Secure Information Technology Center - Austria)" email="" />
 		</authors>
@@ -34,7 +34,7 @@
 		<res id="customicons.xml" src="./customicons.xml" />
 		<res id="Installer.image" src="logo.gif" />
 		<res id="Installer.image.0" src="logo.gif" />
-		<res id="postInstall.jar" src="postInstall.jar" />
+		<res id="pdf-over-install-helper-1.0.0.jar" src="pdf-over-install-helper-1.0.0.jar" />
 	</resources>
 
 	<native type="izpack" name="ShellLink.dll" />
@@ -68,12 +68,12 @@
 			<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"/>
-            <file src="postInstall.jar" targetdir="$INSTALL_PATH/scripts" />
+            <file src="pdf-over-install-helper-1.0.0.jar" targetdir="$INSTALL_PATH/libs" />
             <executable targetfile="$INSTALL_PATH/scripts/pdf-over_linux.sh"
 				os="unix" stage="never"></executable>
 			<executable targetfile="$INSTALL_PATH/scripts/uninstall_linux.sh"
 				os="unix" stage="never"></executable>
-            <executable targetfile="$INSTALL_PATH/scripts/postInstall_linux.sh"
+            <executable targetfile="$INSTALL_PATH/lib/pdf-over-install-helper-1.0.0.jar"
 				os="unix" stage="never"></executable>
 			<executable targetfile="$INSTALL_PATH/scripts/pdf-over_win.bat"
 				os="windows" stage="never"></executable>
-- 
cgit v1.2.3