Show
Ignore:
Timestamp:
14.08.2015 17:59:22 (4 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.

Files:
1 modified

Legend:

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

    r30103 r30111  
    2121     if [[ -e "/tmp/jre.tar" ]]; then 
    2222        rm /tmp/jre_bin 
    23         # get the GS jar installer's name and run it 
     23        # 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) 
    2424        cd "$BASEDIR/Resources/Java/" 
    2525        gs_installer=`ls Greenstone-*-MacOS-intel.jar` 
    26         tar -xvf /tmp/jre.tar -C /tmp && rm /tmp/jre.tar && "/tmp/jre/bin/java" -jar "$gs_installer" 
     26        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" 
     27 
     28        # if after running the installer, the user cancelled installation, then the jre would still be in tmp, remove it to 
     29        if [[ -e "/tmp/jre" ]]; then 
     30           rm -rf /tmp/jre 
     31        fi 
    2732 
    2833     else