Changeset 17670 for gli

Show
Ignore:
Timestamp:
04.11.2008 13:38:08 (11 years ago)
Author:
max
Message:

Solve some problems that were occuring on Ubuntu, and add a temporary fix to search4j which is not working as expected for now.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gli/trunk/gli.sh

    r17669 r17670  
    176176    if [ "x$GSDLHOME" = "x" ]; then 
    177177    cd "$gsdlpath" 
    178     . setup.bash 
     178    . ./setup.bash 
    179179    cd "$thisdir" 
    180180    fi 
     
    184184    if [ "x$GSDL3HOME" = "x" -o "x$GSDL3SRCHOME" = "x" ]; then 
    185185    cd "$gsdlpath" 
    186     . gs3-setup.sh 
     186    . ./gs3-setup.sh 
    187187    cd "$thisdir" 
    188188    fi 
     
    211211    if [ "x$GSDLHOME" = "x" ]; then 
    212212    cd "$gsdl2path" 
    213     . setup.bash 
     213    . ./setup.bash 
    214214    cd "$thisdir" 
    215215    fi 
     
    275275 
    276276# Some users may set this line manually 
    277 javapath= 
    278  
    279 if [ "$javapath" = "" ]; then 
     277javapath="" 
     278 
     279if [ -z $javapath ]; then 
    280280 
    281281    # sus out search4j 
    282     if [ "$_version" -eq 2 -a -x "$GSDLHOME/bin/$GSDLOS/search4j" ]; then 
     282    if [ "$_version" -eq 2 -a -e "$GSDLHOME/bin/$GSDLOS/search4j" ]; then 
    283283        SEARCH4J_EXECUTABLE=$GSDLHOME/bin/$GSDLOS/search4j 
    284     elif [ "$_version" -eq 3 -a -x "$GSDL3SRCHOME/bin/$GSDLOS/search4j" ]; then 
     284    elif [ "$_version" -eq 3 -a -e "$GSDL3SRCHOME/bin/$GSDLOS/search4j" ]; then 
    285285        SEARCH4J_EXECUTABLE=$GSDL3SRCHOME/bin/search4j 
    286     elif [ -x "../bin/$GSDLOS/search4j" ]; then 
     286    elif [ -e "../bin/$GSDLOS/search4j" ]; then 
    287287        SEARCH4J_EXECUTABLE=../bin/$GSDLOS/search4j 
    288     elif [ -x "../bin/search4j" ]; then 
     288    elif [ -e "../bin/search4j" ]; then 
    289289        SEARCH4J_EXECUTABLE=../bin/search4j 
    290290    else 
     
    301301 
    302302        # last-resort tricks 
    303         if [ -e "../packages/jre" ]; then 
    304             function search4j_shell_function() { 
    305               echo `cd ../packages/jre/bin; pwd`/java 
    306             } 
    307             SEARCH4J_EXECUTABLE=search4j_shell_function 
    308         elif [ "$JAVA_HOME" != "" ]; then 
    309             function search4j_shell_function() { 
    310               echo $JAVA_HOME/bin/java 
    311             } 
    312             SEARCH4J_EXECUTABLE=search4j_shell_function 
    313         else 
    314             exit 1 
    315         fi 
    316     fi 
    317  
    318     HINT=`cd ..;pwd` 
     303#        if [ -e "../packages/jre" ]; then 
     304#            function search4j_shell_function() { 
     305#              echo `cd ../packages/jre/bin; pwd`/java 
     306#            } 
     307#            SEARCH4J_EXECUTABLE=search4j_shell_function 
     308#        elif [ "$JAVA_HOME" != "" ]; then 
     309#            function search4j_shell_function() { 
     310#              echo $JAVA_HOME/bin/java 
     311#            } 
     312#            SEARCH4J_EXECUTABLE=search4j_shell_function 
     313#        else 
     314#            exit 1 
     315#        fi 
     316    fi 
     317 
     318    # Since search4j does not recursively search yet, the hint has been altered for now... 
     319    HINT=`cd ..;pwd`/packages/jre 
    319320    javapath=`$SEARCH4J_EXECUTABLE -e -p $HINT -m $MINIMUM_JAVA_VERSION` 
    320321