From 9b34e45d009cdb4416b8864acbbc2c62864e8346 Mon Sep 17 00:00:00 2001
From: tkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7>
Date: Wed, 10 Apr 2013 19:30:59 +0000
Subject: Move contents on mac to app

Unfortunately, the uninstaller condition doesn't seem to work,
so the uninstaller dir is left over

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@360 174cde9d-5d70-4d2a-aa98-46368bc2aaf7
---
 pdf-over-gui/src/main/resources/izpack/install.xml     |  2 +-
 .../src/main/resources/scripts/postinstall_mac.sh      | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/pdf-over-gui/src/main/resources/izpack/install.xml b/pdf-over-gui/src/main/resources/izpack/install.xml
index ec27f294..19199100 100644
--- a/pdf-over-gui/src/main/resources/izpack/install.xml
+++ b/pdf-over-gui/src/main/resources/izpack/install.xml
@@ -10,7 +10,7 @@
 		<authors>
 			<author name="A-SIT (Secure Information Technology Center - Austria)" email="" />
 		</authors>
-		<uninstaller />
+		<uninstaller condition="!izpack.macinstall" />
 		<url>http://www.a-sit.at/</url>
 		<pack200 />
 		<!--run-privileged condition="izpack.windowsinstall.vista|izpack.windowsinstall.7" /-->
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 5597e888..404e92ce 100644
--- a/pdf-over-gui/src/main/resources/scripts/postinstall_mac.sh
+++ b/pdf-over-gui/src/main/resources/scripts/postinstall_mac.sh
@@ -1,8 +1,16 @@
 #!/bin/sh
-BASEDIR=$(cd "$(dirname "$0")"; pwd)
+SCRIPTDIR=$(cd "$(dirname "$0")"; pwd)
+BASEDIR=$(cd "$(dirname "$0")/.."; pwd)
 export LC_CTYPE="UTF-8"
-cd "$BASEDIR"
+cd "$SCRIPTDIR"
 chmod a+x pdf-over_mac.sh
-cd ..
-osacompile -e "do shell script \"$BASEDIR/pdf-over_mac.sh\"" -x -o PDF-Over.app
-cp -f icons/icon.icns PDF-Over.app/Contents/Resources/applet.icns
+cd "$BASEDIR"
+if [ -d "$BASEDIR.app" ]; then
+	osacompile -e "do shell script \"$SCRIPTDIR/pdf-over_mac.sh\"" -x -o PDF-Over.app
+	cp -f icons/icon.icns PDF-Over.app/Contents/Resources/applet.icns
+else
+	osacompile -e "do shell script \"$BASEDIR.app/Contents/scripts/pdf-over_mac.sh\"" -x -o "$BASEDIR.app"
+	cp -f icons/icon.icns "$BASEDIR.app"/Contents/Resources/applet.icns
+	mv "$BASEDIR"/* "$BASEDIR.app"/Contents/
+	rmdir "$BASEDIR"
+fi
-- 
cgit v1.2.3