Skip to content

Fix handling of spaces in Windows paths #21921

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 2, 2016
Merged

Fix handling of spaces in Windows paths #21921

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
12 changes: 6 additions & 6 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,20 +4,20 @@ 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
Copy link

@ngbrown ngbrown Dec 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The quotes should surround the entire path, including the .exe.

Copy link
Member Author

@jasontedor jasontedor Dec 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? I tested it with this change. Do you have an example where this would break without your suggestion?

) ELSE (
FOR %%I IN (java.exe) DO set JAVA=%%~$PATH:I
)
IF NOT EXIST "%JAVA%" (
IF NOT EXIST %JAVA% (
ECHO Could not find any executable java binary. Please install java in your PATH or set JAVA_HOME 1>&2
EXIT /B 1
)
IF DEFINED JAVA_HOME GOTO :cont

IF NOT "%JAVA:~-13%" == "\bin\java.exe" (
IF NOT %JAVA:~-13% == "\bin\java.exe" (
FOR /f "tokens=2 delims=[]" %%I IN ('dir %JAVA%') DO @set JAVA=%%I
)
IF "%JAVA:~-13%" == "\bin\java.exe" (
IF %JAVA:~-13% == "\bin\java.exe" (
SET JAVA_HOME=%JAVA:~0,-13%
)

Expand All @@ -27,14 +27,14 @@ if not "%CONF_FILE%" == "" goto conffileset
set SCRIPT_DIR=%~dp0
for %%I in ("%SCRIPT_DIR%..") do set ES_HOME=%%~dpfI

"%JAVA%" -Xmx50M -version > nul 2>&1
%JAVA% -Xmx50M -version > nul 2>&1

if errorlevel 1 (
echo Warning: Could not start JVM to detect version, defaulting to x86:
goto x86
)

"%JAVA%" -Xmx50M -version 2>&1 | "%windir%\System32\find" "64-Bit" >nul:
%JAVA% -Xmx50M -version 2>&1 | "%windir%\System32\find" "64-Bit" >nul:

if errorlevel 1 goto x86
set EXECUTABLE=%ES_HOME%\bin\elasticsearch-service-x64.exe
Expand Down
2 changes: 1 addition & 1 deletion distribution/src/main/resources/bin/elasticsearch.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ IF ERRORLEVEL 1 (
EXIT /B %ERRORLEVEL%
)

"%JAVA%" %ES_JAVA_OPTS% %ES_PARAMS% -cp "%ES_CLASSPATH%" "org.elasticsearch.bootstrap.Elasticsearch" !newparams!
%JAVA% %ES_JAVA_OPTS% %ES_PARAMS% -cp "%ES_CLASSPATH%" "org.elasticsearch.bootstrap.Elasticsearch" !newparams!

ENDLOCAL
4 changes: 2 additions & 2 deletions distribution/src/main/resources/bin/elasticsearch.in.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@echo off

IF DEFINED JAVA_HOME (
set JAVA=%JAVA_HOME%\bin\java.exe
set JAVA="%JAVA_HOME%"\bin\java.exe
Copy link

@ngbrown ngbrown Dec 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The quotes should surround the entire path, including the .exe.

) ELSE (
FOR %%I IN (java.exe) DO set JAVA=%%~$PATH:I
)
IF NOT EXIST "%JAVA%" (
IF NOT EXIST %JAVA% (
ECHO Could not find any executable java binary. Please install java in your PATH or set JAVA_HOME 1>&2
EXIT /B 1
)
Expand Down