Changeset 20307 for greenstone3/trunk

Timestamp:

2009-08-17T17:01:07+12:00 (15 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:

• greenstone3/trunk/gs3-setup.bat (modified) (2 diffs)

greenstone3/trunk/gs3-setup.bat

@@ -60 +60 @@
 set RUNJAVA=
 if exist bin\search4j.exe (
-  for /F "tokens=*" %%r in ('bin\search4j.exe -p "%HINT%" -m %JAVA_MIN_VERSION%') do set FOUNDJAVAHOME=%%r
+  for /F "tokens=*" %%r in ('bin\search4j.exe -d -p "%HINT%" -m %JAVA_MIN_VERSION%') do set FOUNDJAVAHOME=%%r
+  for /F "tokens=*" %%r in ('bin\search4j.exe -r -p "%HINT%" -m %JAVA_MIN_VERSION%') do set FOUNDJREHOME=%%r
 )
 
@@ -67 +68 @@
   set PATH=%FOUNDJAVAHOME%\bin;%PATH%
   set RUNJAVA=%FOUNDJAVAHOME%\bin\java.exe
+  goto summaryThenEnd
+)
+
+if not "%FOUNDJREHOME%"=="" (
+  set JRE_HOME=%FOUNDJREHOME%
+  set PATH=%FOUNDJREHOME%\bin;%PATH%
+  set RUNJAVA=%FOUNDJREHOME%\bin\java.exe
   goto summaryThenEnd
 )