github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 06:37:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Use JAVA_EXE as variable for symlink

Browse source 
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>

Fixes #4913
This commit is contained in:
Stefan Scherer 2016-04-20 08:17:10 +02:00 • committed by Suyog Rao
parent 25386c488c
commit a91bf9c40b
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bin/setup.bat
View file

@ -15,13 +15,11 @@ goto finally
:setup_jruby
REM setup_java()
set JAVA_FROM_SYMLINK=
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_HOME=%%a
set JAVA_FROM_SYMLINK=1
for /f "tokens=2 delims=[]" %%a in ('dir %ProgramData%\Oracle\java\javapath\java.exe') do @set JAVA_EXE=%%a
)
if defined JAVA_HOME set JAVA_HOME=%JAVA_HOME:\bin\java.exe=%
if "%JAVA_FROM_SYMLINK%" == "1" (
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 not defined JAVA_HOME goto missing_java_home