Changeset 20307 for greenstone3


Ignore:
Timestamp:
2009-08-17T17:01:07+12:00 (12 years ago)
Author:
oranfry
Message:

tomcat doesn't like java_home pointing to a jre (and presumably the reverse) so made gs3-setup more careful about this

File:
1 edited

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/gs3-setup.bat

    r20304 r20307  
    6060set RUNJAVA=
    6161if exist bin\search4j.exe (
    62   for /F "tokens=*" %%r in ('bin\search4j.exe -p "%HINT%" -m %JAVA_MIN_VERSION%') do set FOUNDJAVAHOME=%%r
     62  for /F "tokens=*" %%r in ('bin\search4j.exe -d -p "%HINT%" -m %JAVA_MIN_VERSION%') do set FOUNDJAVAHOME=%%r
     63  for /F "tokens=*" %%r in ('bin\search4j.exe -r -p "%HINT%" -m %JAVA_MIN_VERSION%') do set FOUNDJREHOME=%%r
    6364)
    6465
     
    6768  set PATH=%FOUNDJAVAHOME%\bin;%PATH%
    6869  set RUNJAVA=%FOUNDJAVAHOME%\bin\java.exe
     70  goto summaryThenEnd
     71)
     72
     73if not "%FOUNDJREHOME%"=="" (
     74  set JRE_HOME=%FOUNDJREHOME%
     75  set PATH=%FOUNDJREHOME%\bin;%PATH%
     76  set RUNJAVA=%FOUNDJREHOME%\bin\java.exe
    6977  goto summaryThenEnd
    7078)
Note: See TracChangeset for help on using the changeset viewer.