diff options
| -rw-r--r-- | pdf-over-gui/src/main/resources/izpack/install.xml | 5 | ||||
| -rw-r--r-- | pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh | 2 | ||||
| -rw-r--r-- | pdf-over-gui/src/main/resources/scripts/postinstall_mac.sh | 7 |
3 files changed, 11 insertions, 3 deletions
diff --git a/pdf-over-gui/src/main/resources/izpack/install.xml b/pdf-over-gui/src/main/resources/izpack/install.xml index 5febfc92..ec27f294 100644 --- a/pdf-over-gui/src/main/resources/izpack/install.xml +++ b/pdf-over-gui/src/main/resources/izpack/install.xml @@ -65,15 +65,16 @@ <file src="PDF-Over.ini" targetdir="$INSTALL_PATH" os="windows"/> <file src="PDF-Over-Un.ini" targetdir="$INSTALL_PATH/Uninstaller" os="windows"/> <singlefile src="PDF-Over.exe" target="$INSTALL_PATH/Uninstaller/PDF-Over-Un.exe" os="windows"/> - <singlefile src="scripts/pdf-over_mac.sh" target="$INSTALL_PATH/pdf-over.sh" os="mac"/> <executable targetfile="$INSTALL_PATH/scripts/pdf-over_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" os="windows" stage="never"></executable> - <executable targetfile="$INSTALL_PATH/pdf-over.sh" + <executable targetfile="$INSTALL_PATH/scripts/pdf-over_mac.sh" os="mac" stage="never"></executable> + <executable targetfile="$INSTALL_PATH/scripts/postinstall_mac.sh" + os="mac" stage="postinstall"></executable> </pack> </packs> 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 e4cd4722..8ae4abb1 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,4 @@ #!/bin/sh BASEDIR=$(cd "$(dirname "$0")"; pwd) export LC_CTYPE="UTF-8" -(cd "$BASEDIR/PDF-Over" && exec java -XstartOnFirstThread -cp "lib/*" at.asit.pdfover.gui.Main "$@" &) +(cd "$BASEDIR/.." && exec java -XstartOnFirstThread -cp "lib/*" at.asit.pdfover.gui.Main "$@" &) diff --git a/pdf-over-gui/src/main/resources/scripts/postinstall_mac.sh b/pdf-over-gui/src/main/resources/scripts/postinstall_mac.sh new file mode 100644 index 00000000..76d860cf --- /dev/null +++ b/pdf-over-gui/src/main/resources/scripts/postinstall_mac.sh @@ -0,0 +1,7 @@ +#!/bin/sh +BASEDIR=$(cd "$(dirname "$0")"; pwd) +export LC_CTYPE="UTF-8" +cd "$BASEDIR" +chmod a+x pdf-over_mac.sh +cd .. +osacompile -e "do shell script \"$BASEDIR/pdf-over_mac.sh\"" -x -o PDF-Over.app |