Changeset 30111 for main/trunk/release-kits/shared/mac/Wrapper.app/Contents/MacOS/greenstone

Timestamp:

2015-08-14T17:59:22+12:00 (9 years ago)

Author:

ak19

Message:

1. Dr Bainbridge got the GS icon to appear in the dock throughout installation after the recent update to Wrapper.app using a bash script rather than the JavaApplicationStub. 2. remove jre extracted to /tmp if the user had cancelled the GS3 installation in which case /tmp/jre would still be around.

File:

• main/trunk/release-kits/shared/mac/Wrapper.app/Contents/MacOS/greenstone (modified) (1 diff)

main/trunk/release-kits/shared/mac/Wrapper.app/Contents/MacOS/greenstone

@@ -21 +21 @@
      if [[ -e "/tmp/jre.tar" ]]; then
         rm /tmp/jre_bin
-        # get the GS jar installer's name and run it
+        # get the GS jar installer's name and run it with a dock icon (http://stackoverflow.com/questions/6006173/how-do-you-change-the-dock-icon-of-a-java-program)
         cd "$BASEDIR/Resources/Java/"
         gs_installer=`ls Greenstone-*-MacOS-intel.jar`
-        tar -xvf /tmp/jre.tar -C /tmp && rm /tmp/jre.tar && "/tmp/jre/bin/java" -jar "$gs_installer"
+        tar -xvf /tmp/jre.tar -C /tmp && rm /tmp/jre.tar && "/tmp/jre/bin/java" -jar -Xdock:icon="$BASEDIR/Resources/Java/icon.icns" "$gs_installer"
+
+        # if after running the installer, the user cancelled installation, then the jre would still be in tmp, remove it to
+        if [[ -e "/tmp/jre" ]]; then
+           rm -rf /tmp/jre
+        fi
 
      else