Search java executable in %PATH%

Fixes #6860
This commit is contained in:
manni19682 2017-03-30 16:41:57 +02:00 committed by Suyog Rao
parent f74a7c9d56
commit 933c936917

View file

@ -15,11 +15,11 @@ goto finally
:setup_jruby
REM setup_java()
if not defined JAVA_HOME IF EXIST %ProgramData%\Oracle\java\javapath\java.exe (
for /f "tokens=2 delims=[]" %%a in ('dir %ProgramData%\Oracle\java\javapath\java.exe') do @set JAVA_EXE=%%a
IF NOT DEFINED JAVA_HOME (
FOR %%I IN (java.exe) DO set JAVA_EXE=%%~$PATH:I
)
if defined JAVA_EXE set JAVA_HOME=%JAVA_EXE:\bin\java.exe=%
if defined JAVA_EXE echo Using JAVA_HOME=%JAVA_HOME% retrieved from %ProgramData%\Oracle\java\javapath\java.exe
if defined JAVA_EXE echo Using JAVA_HOME=%JAVA_HOME% retrieved from PATH
if not defined JAVA_HOME goto missing_java_home
REM ***** JAVA options *****