Ignore:
Timestamp:
2011-01-15T15:22:57+13:00 (13 years ago)
Author:
sjm84
Message:

Another set of trunk changes to commit to this branch

Location:
main/branches/64_bit_Greenstone/greenstone2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/branches/64_bit_Greenstone/greenstone2

  • main/branches/64_bit_Greenstone/greenstone2/gs2-server.sh

    r20896 r23594  
    145145    fi
    146146
     147    # -Xdock:name      To set the name of the app in the MacOS Dock bar
     148    # -Xdock:icon      Path to the MacOS Doc icon (not necessary for GS)   
     149    custom_vm_args=""
     150    if [ "$GSDLOS" = "darwin" ]; then
     151        custom_vm_args="-Xdock:name=$PROGABBR"
     152    fi
     153
     154
    147155    if [ "x$silent" == "x" -o "x$silent" != "xtrue" ]; then
    148156        # verbose mode, show all output, but then we can't run the server interface in the background
    149157   
    150     "$javapath" org.greenstone.server.Server2 "$GSDLHOME" "$serverlang" $*
     158    "$javapath" $custom_vm_args org.greenstone.server.Server2 "$GSDLHOME" "$serverlang" $*
    151159    else
    152160        # If we launch the Greenstone Server Interface application in the background (with & at end)
    153161        # need to redirect any STDERR (STDOUT) output to /dev/null first, else output will hog the x-term.
    154     "$javapath" org.greenstone.server.Server2 "$GSDLHOME" "$serverlang" $* > /dev/null &
     162    "$javapath" $custom_vm_args org.greenstone.server.Server2 "$GSDLHOME" "$serverlang" $* > /dev/null &
    155163    fi
    156164
Note: See TracChangeset for help on using the changeset viewer.