Code cleanup, Mac script changed

9 files changed, 16 insertions, 24 deletions

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 9cf917bd..4e6df19a 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
@@ -45,17 +45,6 @@ public class Main {
 	 * @throws IOException 
 	 */
 	public static void main(String[] args) throws IOException {
-//		log.debug("Loading SWT libraries"); //$NON-NLS-1$
-//		try {
-//			SWTLoader.loadSWT();
-//		} catch (InitializationException e) {
-//			log.error("Could not load SWT libraries", e); //$NON-NLS-1$
-//			JOptionPane.showMessageDialog(null,
-//					Messages.getString("error.SWTLib"), //$NON-NLS-1$
-//					Messages.getString("error.TitleFatal"), //$NON-NLS-1$
-//					JOptionPane.ERROR_MESSAGE);
-//		}
-//		log.info("===== Starting " + Constants.APP_NAME_VERSION + " ====="); //$NON-NLS-1$ //$NON-NLS-2$
 
 		try {
 		File configDir = new File(Constants.CONFIG_DIRECTORY);
@@ -70,8 +59,6 @@ public class Main {
 			PropertyConfigurator.configureAndWatch(log4j.getAbsolutePath());
 		}
 		
-		
-//		log.debug("SWT version: " + SWT.getVersion()); //$NON-NLS-1$
 
 		StateMachineImpl stateMachine = new StateMachineImpl(args);
 		
diff --git a/pdf-over-gui/src/main/resources/izpack/install.xml b/pdf-over-gui/src/main/resources/izpack/install.xml
index 40fcb820..03f6a56f 100644
--- a/pdf-over-gui/src/main/resources/izpack/install.xml
+++ b/pdf-over-gui/src/main/resources/izpack/install.xml
@@ -34,7 +34,6 @@
 		<res id="customicons.xml" src="./customicons.xml" />
 		<res id="Installer.image" src="logo.gif" />
 		<res id="Installer.image.0" src="logo.gif" />
-<!-- 		<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" />
@@ -65,8 +64,8 @@
 			<file src="scripts" targetdir="$INSTALL_PATH" />
 			<file src="icons" targetdir="$INSTALL_PATH" />
 			<file src="ReadMe.txt" targetdir="$INSTALL_PATH" />
-			<file src="PDF-Over.exe" targetdir="$INSTALL_PATH" os="windows"/>
-			<file src="PDF-Over-cli.exe" targetdir="$INSTALL_PATH" os="windows"/>
+<!-- 			<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="pdf-over-install-helper-1.0.0.jar" targetdir="$INSTALL_PATH/libs" /> -->
             <executable targetfile="$INSTALL_PATH/scripts/pdf-over_linux.sh"
@@ -81,12 +80,12 @@
 				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" keep="true"></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" keep="true"></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/izpack/win_shortcutSpec.xml b/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml
index 72d4b271..48dfca76 100644
--- a/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml
+++ b/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml
@@ -11,7 +11,7 @@
      applications="no"
      startMenu="no"
      startup="no"
-     target="$INSTALL_PATH/PDF-Over.exe"
+     target="$INSTALL_PATH/scripts/pdf-over_win.bat"
      commandLine=""
      workingDirectory="$INSTALL_PATH"
      description="PDF-Over 4.1"
diff --git a/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec_deu.xml b/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec_deu.xml
index 555874eb..26b1a640 100644
--- a/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec_deu.xml
+++ b/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec_deu.xml
@@ -11,7 +11,7 @@
      applications="no"
      startMenu="no"
      startup="no"
-     target="$INSTALL_PATH/PDF-Over.exe"
+     target="$INSTALL_PATH/scripts/pdf-over_win.bat"
      commandLine=""
      workingDirectory="$INSTALL_PATH"
      description="PDF-Over 4.1"
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 8ee31f2a..cbd8db16 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,4 @@
 #!/bin/sh
 BASEDIR=`dirname $0`
+java -jar "$BASEDIR/../lib/pdf-over-install-helper-1.0.0.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 dcb805ae..3ad25c74 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,5 @@
 #!/bin/sh
 BASEDIR=$(cd "$(dirname "$0")"; pwd)
 export LC_CTYPE="UTF-8"
+java -jar "$BASEDIR/../lib/pdf-over-install-helper-1.0.0.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.bat b/pdf-over-gui/src/main/resources/scripts/pdf-over_win.bat
index 6468e582..5597168b 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,2 +1,3 @@
 @echo off

+start /b javaw -jar "%~dp0\..\lib\pdf-over-install-helper-1.0.0.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
index e7553a99..8c4b18a6 100644
--- a/pdf-over-gui/src/main/resources/scripts/postInstall_linux.sh
+++ b/pdf-over-gui/src/main/resources/scripts/postInstall_linux.sh
@@ -1,2 +1,4 @@
 #!/bin/sh
-exec java -jar ../lib/pdf-over-install-helper-1.0.0.jar
+BASEDIR=`dirname $0`
+java -jar "$BASEDIR/../lib/pdf-over-install-helper-1.0.0.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
index 419ae097..496bf419 100644
--- a/pdf-over-gui/src/main/resources/scripts/postInstall_win.bat
+++ b/pdf-over-gui/src/main/resources/scripts/postInstall_win.bat
@@ -1 +1,2 @@
-start /b java -jar ../lib/pdf-over-install-helper-1.0.0.jar
+@echo off
+java -jar "%~dp0\..\lib\pdf-over-install-helper-1.0.0.jar"