summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7>2013-04-10 19:36:18 +0000
committertkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7>2013-04-10 19:36:18 +0000
commit9e6e26977a1a6c3c00b1dcb1f4e24e86232a738a (patch)
tree3f612e2aa112926c1d24de6d33dbfcc62c0a74cd
parentd6de3b8d165b29ba6f6a0a629dc83ca01b60dde1 (diff)
downloadpdf-over-9e6e26977a1a6c3c00b1dcb1f4e24e86232a738a.tar.gz
pdf-over-9e6e26977a1a6c3c00b1dcb1f4e24e86232a738a.tar.bz2
pdf-over-9e6e26977a1a6c3c00b1dcb1f4e24e86232a738a.zip
Update windows scripts, add linux uninstall script
git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@407 174cde9d-5d70-4d2a-aa98-46368bc2aaf7
-rw-r--r--pdf-over-gui/src/main/resources/izpack/install.xml6
-rw-r--r--pdf-over-gui/src/main/resources/scripts/pdf-over_win.bat5
-rw-r--r--pdf-over-gui/src/main/resources/scripts/uninstall_linux.sh3
-rw-r--r--pdf-over-gui/src/main/resources/scripts/uninstall_win.bat5
4 files changed, 14 insertions, 5 deletions
diff --git a/pdf-over-gui/src/main/resources/izpack/install.xml b/pdf-over-gui/src/main/resources/izpack/install.xml
index 015c42f8..eb3dc21c 100644
--- a/pdf-over-gui/src/main/resources/izpack/install.xml
+++ b/pdf-over-gui/src/main/resources/izpack/install.xml
@@ -27,12 +27,10 @@
<resources>
<res id="Unix_shortcutSpec.xml" src="./unix_shortcutSpec.xml" />
- <res id="Win_shortcutSpec.xml" src="./win_shortcutSpec.xml" />
- <res id="Win_shortcutSpec.xml_deu" src="./win_shortcutSpec_deu.xml" />
<res id="shortcutSpec.xml" src="./win_shortcutSpec.xml" />
<res id="shortcutSpec.xml_deu" src="./win_shortcutSpec_deu.xml" />
<res id="TargetPanel.dir.windows" src="defaultInstallDirWinProfile.txt" />
- <res id="JFrameIcon.png" src="icon16x16.png"/>
+ <res id="JFrameIcon.png" src="icon16x16.png" />
<res id="customicons.xml" src="./customicons.xml" />
<res id="Installer.image" src="logo.gif" />
<res id="Installer.image.0" src="logo.gif" />
@@ -66,6 +64,8 @@
<singlefile src="PDF-Over.exe" target="$INSTALL_PATH/Uninstaller/PDF-Over-Un.exe" os="windows"/>
<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/pdf-over_win.bat"
os="windows" stage="never"></executable>
<executable targetfile="$INSTALL_PATH/scripts/uninstall_win.bat"
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 ae0cbbca..66d3c22e 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 +1,4 @@
-@start /b javaw -jar lib\pdf-over-gui-4.0.0-SNAPSHOT.jar %* \ No newline at end of file
+@echo off
+pushd %~dp0\..
+start /b javaw -jar lib\pdf-over-gui-4.0.0-SNAPSHOT.jar %*
+popd \ No newline at end of file
diff --git a/pdf-over-gui/src/main/resources/scripts/uninstall_linux.sh b/pdf-over-gui/src/main/resources/scripts/uninstall_linux.sh
new file mode 100644
index 00000000..4f36b8e9
--- /dev/null
+++ b/pdf-over-gui/src/main/resources/scripts/uninstall_linux.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+BASEDIR=`dirname $0`
+(cd "$BASEDIR/.." && exec java -jar Uninstaller/uninstaller.jar)
diff --git a/pdf-over-gui/src/main/resources/scripts/uninstall_win.bat b/pdf-over-gui/src/main/resources/scripts/uninstall_win.bat
index f9da9ee1..4c01a10b 100644
--- a/pdf-over-gui/src/main/resources/scripts/uninstall_win.bat
+++ b/pdf-over-gui/src/main/resources/scripts/uninstall_win.bat
@@ -1 +1,4 @@
-@start /b Uninstaller\uninstaller.jar \ No newline at end of file
+@echo off
+pushd %~dp0\..
+start /b Uninstaller\uninstaller.jar
+popd \ No newline at end of file