Skip to content

Another fix for handling of paths on Windows #22132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 21, 2016
Merged

Another fix for handling of paths on Windows #22132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions distribution/src/main/resources/bin/elasticsearch-service.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SETLOCAL enabledelayedexpansion
TITLE Elasticsearch Service ${project.version}

IF DEFINED JAVA_HOME (
SET JAVA="%JAVA_HOME%"\bin\java.exe
SET JAVA="%JAVA_HOME%\bin\java.exe"
) ELSE (
FOR %%I IN (java.exe) DO set JAVA=%%~$PATH:I
)
Expand Down Expand Up @@ -121,19 +121,19 @@ echo Installing service : "%SERVICE_ID%"
echo Using JAVA_HOME (%ARCH%): "%JAVA_HOME%"

rem Check JVM server dll first
if exist "%JAVA_HOME%"\jre\bin\server\jvm.dll (
if exist "%JAVA_HOME%\jre\bin\server\jvm.dll" (
set JVM_DLL=\jre\bin\server\jvm.dll
goto foundJVM
)

rem Check 'server' JRE (JRE installed on Windows Server)
if exist "%JAVA_HOME%"\bin\server\jvm.dll (
if exist "%JAVA_HOME%\bin\server\jvm.dll" (
set JVM_DLL=\bin\server\jvm.dll
goto foundJVM
)

rem Fallback to 'client' JRE
if exist "%JAVA_HOME%"\bin\client\jvm.dll (
if exist "%JAVA_HOME%\bin\client\jvm.dll" (
set JVM_DLL=\bin\client\jvm.dll
echo Warning: JAVA_HOME points to a JRE and not JDK installation; a client (not a server^) JVM will be used...
) else (
Expand Down
2 changes: 1 addition & 1 deletion distribution/src/main/resources/bin/elasticsearch.in.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@echo off

IF DEFINED JAVA_HOME (
set JAVA="%JAVA_HOME%"\bin\java.exe
set JAVA="%JAVA_HOME%\bin\java.exe"
) ELSE (
FOR %%I IN (java.exe) DO set JAVA=%%~$PATH:I
)
Expand Down