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

Timestamp:

2015-08-24T19:21:57+12:00 (9 years ago)

Author:

ak19

Message:

Adding code to handle 32 bit MacOS case where there is no bundled jre: use the system java (which came with 32 bit Mac OS) to launch the gs installer.

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

@@ -37 +37 @@
        # exit
      fi
+else
+    # try using a system java to run the installer, as there is no bundled jre_bin for 32 bit Mac OS since these already came with java installed
+  
+    # 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`
+
+    # on a mac, the system java is returned by running /usr/libexec/java_home
+    # use this to run the greenstone installer
+    `/usr/libexec/java_home`/bin/java -jar -Xdock:icon="$BASEDIR/Resources/icon.icns" "$gs_installer"
 fi