Changeset 19738

Show
Ignore:
Timestamp:
04.06.2009 16:59:29 (10 years ago)
Author:
ak19
Message:

Instead of calling search4j directly, it reuses the code of findjava.sh (now nearly duplicated and a copy placed in the GS2 installation folder).

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/gs2-server.sh

    r19450 r19738  
    105105    fi 
    106106 
    107     javapath="`search4j -m $java_min_version -e`" 
     107    ## ---- Check Java ---- 
     108    # call the script with source, so that we have the variables it sets ($javapath) 
     109    exit_status=0 
     110    source ./findjava.sh $serverlang 
     111    exit_status=$? 
     112    if [ "$exit_status" -eq 1 ]; then 
     113        exit 1; 
     114    fi 
     115 
    108116    if [ "x$silent" == "x" -o "x$silent" != "xtrue" ]; then  
    109117        # verbose mode, show all output, but then we can't run the server interface in the background