Changeset 30119


Ignore:
Timestamp:
08/22/15 19:22:41 (6 years ago)
Author:
ak19
Message:

Mac icons for when launching the startup scripts from the command line. This also ensures the appropriate icon for the second item in the dock panel when launching the .app files.

Location:
main/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/client-gli.sh

    r24881 r30119  
    141141if [ "$GSDLOS" = "darwin" ]; then
    142142    custom_vm_args="-Xdock:name=$PROGABBR"
     143    if [ -f "../client-gli.app/Contents/Resources/AutomatorApplet.icns" ]; then
     144    custom_vm_args="$custom_vm_args -Xdock:icon=../client-gli.app/Contents/Resources/AutomatorApplet.icns"
     145    fi
    143146fi
    144147
  • main/trunk/gli/gems.sh

    r23590 r30119  
    110110if [ "$GSDLOS" = "darwin" ]; then
    111111    custom_vm_args="-Xdock:name=$PROGABBR"
     112    if [ -f "../gems.app/Contents/Resources/AutomatorApplet.icns" ]; then
     113    custom_vm_args="$custom_vm_args -Xdock:icon=../gems.app/Contents/Resources/AutomatorApplet.icns"
     114    fi
    112115fi
    113116
  • main/trunk/gli/gli.sh

    r25729 r30119  
    149149    if [ "$GSDLOS" = "darwin" ]; then
    150150        custom_vm_args="-Xdock:name=$PROGABBR"
     151    if [ -f "../gli.app/Contents/Resources/AutomatorApplet.icns" ]; then
     152       custom_vm_args="$custom_vm_args -Xdock:icon=../gli.app/Contents/Resources/AutomatorApplet.icns"
     153    fi
    151154    fi
    152155   
  • main/trunk/greenstone3/gs3-server.sh

    r30106 r30119  
    104104# JRE_HOME or JAVA_HOME must be set correctly to run this program
    105105HINT="`pwd`/packages/jre"
    106 if [ "$GSDLOS" = "darwin" ] && [ ! -d "$HINT" ]; then
    107     HINT=`/usr/libexec/java_home`
     106if [ "$GSDLOS" = "darwin" ]; then
     107    if [ ! -d "$HINT" ]; then
     108    HINT=`/usr/libexec/java_home`
     109    fi
     110   
     111    # set the mac icon for when launching this script manually
     112    if [ -f "gs3-server.app/Contents/Resources/AutomatorApplet.icns" ]; then
     113    opt_properties="$opt_properties -Xdock:icon=gs3-server.app/Contents/Resources/AutomatorApplet.icns"
     114    fi
    108115fi
     116
    109117javapath=`search4j -p "$HINT" -m $java_min_version -e`
    110118if [ "$?" == "0" ]; then
Note: See TracChangeset for help on using the changeset viewer.