Changeset 20059


Ignore:
Timestamp:
2009-07-22T09:38:23+12:00 (13 years ago)
Author:
oranfry
Message:

making search4j calls use the bundled jre as a priority hint consistently, and added quotes to a few paths

Location:
greenstone3/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/gs3-server.sh

    r19937 r20059  
    5050
    5151# JRE_HOME or JAVA_HOME must be set correctly to run this program
    52 search4j -m $java_min_version &> /dev/null
     52HINT="`pwd`/packages/jre"
     53javapath=`search4j -p "$HINT" -m $java_min_version -e`
    5354if [ "$?" == "0" ]; then
    5455    # In Java code, '...getResourceAsStream("build.properties")'
    5556    # needs up to be in the right directory when run
    56     pushd $gsdl3path > /dev/null
     57    pushd "$gsdl3path" > /dev/null
    5758
    58     javapath=`search4j -m $java_min_version -e`
    59     $javapath org.greenstone.server.Server3 $GSDL3SRCHOME $serverlang
     59    "$javapath" org.greenstone.server.Server3 "$GSDL3SRCHOME" $serverlang
    6060
    6161    popd > /dev/null
  • greenstone3/trunk/gs3-setup.sh

    r18128 r20059  
    128128  echo "Checking Java"
    129129
    130   HINT=`pwd`/packages/jre
    131   FOUNDJAVAHOME=`bin/search4j -p $HINT -m $java_min_version`
     130  HINT="`pwd`/packages/jre"
     131  FOUNDJAVAHOME="`bin/search4j -p $HINT -m $java_min_version`"
    132132  if [ "$?" != "0" ]; then
    133133
     
    135135    if [ "$?" == "0" ]; then
    136136      #bundled java exists, set up
    137       export JAVA_HOME=$FOUNDJAVAHOME
     137      export JAVA_HOME="$FOUNDJAVAHOME"
    138138      echo "  - Set (exported) JAVA_HOME to $FOUNDJAVAHOME"
    139139    else
Note: See TracChangeset for help on using the changeset viewer.