Show
Ignore:
Timestamp:
24.08.2015 19:21:57 (4 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/shared/mac/Wrapper.app/Contents/MacOS/greenstone

    r30118 r30129  
    3737       # exit 
    3838     fi 
     39else 
     40    # 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 
     41   
     42    # 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) 
     43    cd "$BASEDIR/Resources/Java/" 
     44    gs_installer=`ls Greenstone-*-MacOS-intel.jar` 
     45 
     46    # on a mac, the system java is returned by running /usr/libexec/java_home 
     47    # use this to run the greenstone installer 
     48    `/usr/libexec/java_home`/bin/java -jar -Xdock:icon="$BASEDIR/Resources/icon.icns" "$gs_installer" 
    3949fi