Another fix for handling of paths on Windows

[jasontedor]

A previous fix for the handling of paths on Windows related to paths
containing multiple spaces introduced a issue where if JAVA_HOME ends
with a backslash, then Elasticsearch will refuse to start. This is not a
critical bug as a workaround exists (remove the trailing backslash), but
should be fixed nevertheless. This commit addresses this situation while
not regressing the previous fix.

Relates #21921

[yannlebel]

When I read this it seems the issue is not closed and included in a release package but when I download the elasticsearch zip from here https://www.elastic.co/downloads/elasticsearch it's already included. Did something went wrong?

This fix in not working for me. I tested the version 5.1.1 on windows 7 (x64) and windows server 2012 R2 (x64) standard and had the same issue every time.

The quote around the %JAVA_HOME% and %JAVA% variables are not placed correctly which prevent the scripts to start the node and to detect the JVM version which always default the service installation to the x86 version.

My JAVA_HOME variable is set with the value: C:\Program Files\Java\jdk1.8.0_111
My installation folder for elasticsearch is: D:\ELK\elasticsearch\

######Result of the elasticsearch.bat execution before the fix:

######Result of the elasticsearch-service.bat execution before the fix:

To fix the problem I had to do the following changes:

• In elastisearch.bat
  • Line 82
    • From: %JAVA% %ES_JAVA_OPTS% %ES_PARAMS% -cp "%ES_CLASSPATH%" "org.elasticsearch.bootstrap.Elasticsearch" !newparams!
    • To: "%JAVA%" %ES_JAVA_OPTS% %ES_PARAMS% -cp "%ES_CLASSPATH%" "org.elasticsearch.bootstrap.Elasticsearch" !newparams!
• In elasticsearch.in.bat
  • Line 4
    • From: set JAVA="%JAVA_HOME%"\bin\java.exe
    • To: set JAVA=%JAVA_HOME%\bin\java.exe
  • Line 8
    • From: IF NOT EXIST %JAVA% (
    • To: IF NOT EXIST "%JAVA%" (
• In Elasticsearch-service.bat
  • Line 32
    • From: SET JAVA="%JAVA_HOME%"\bin\java.exe
    • To: SET JAVA=%JAVA_HOME%\bin\java.exe
  • Line 36
    • From: IF NOT EXIST %JAVA% (
    • To: IF NOT EXIST "%JAVA%" (
  • Line 55
    • From: %JAVA% -Xmx50M -version > nul 2>&1
    • To: "%JAVA%" -Xmx50M -version > nul 2>&1
  • Line 62
    • From: %JAVA% -Xmx50M -version 2>&1 | "%windir%\System32\find" "64-Bit" >nul:
    • To: "%JAVA%" -Xmx50M -version 2>&1 | "%windir%\System32\find" "64-Bit" >nul:
  • Line 149
    • From: if exist "%JAVA_HOME%"\jre\bin\server\jvm.dll (
    • To: if exist "%JAVA_HOME%\jre\bin\server\jvm.dll" (
  • Line 155
    • From: if exist "%JAVA_HOME%"\bin\server\jvm.dll (
    • To: if exist "%JAVA_HOME%\bin\server\jvm.dll" (
  • Line 161
    • From: if exist "%JAVA_HOME%"\bin\client\jvm.dll (
    • To: if exist "%JAVA_HOME%\bin\client\jvm.dll" (

Here are the files with the fixes:

elasticsearch-service.bat.txt
elasticsearch.bat.txt
elasticsearch.in.bat.txt

Hope it helps.

[jasontedor]

This PR will address that.

[yannlebel]

yes sorry like I answer on the other PR I miss read the commits all is fine. Thanks again and keep the good work I can't stop loving elasticsearch :)

[jasontedor]

sorry

It's me that should be sorry for introducing one bug while fixing another. I am sorry about that.

Thanks again and keep the good work I can't stop loving elasticsearch :)

Music to my ears; you're welcome.

[rjernst]

Windows escaping is so weird. :) LGTM

[jasontedor]

Thanks @rjernst.

[ChristianGruen]

Thanks for this fix! I solved the problem locally by rewriting…

set JAVA="%JAVA_HOME%"\bin\java.exe

…to…

set JAVA="%JAVA_HOME%\bin\java.exe"

…but @rjernst’s proposal works fine, and it includes the services batch script.