Fix use of spaces on Windows if JAVA_HOME not set

jasontedor · jasontedor · commit dc9b67461f23 · 2017-06-22T21:55:31.000-04:00
When JAVA_HOME is not set we try to detect the location of Java. If its location contains a space, due to a lack of quoting we will be unsuccessful in invoking Java. This commit adds the necessary quoting to handle this case. Relates #23822
diff --git a/distribution/src/main/resources/bin/elasticsearch.in.bat b/distribution/src/main/resources/bin/elasticsearch.in.bat
@@ -3,7 +3,7 @@
 IF DEFINED JAVA_HOME (
   set JAVA="%JAVA_HOME%\bin\java.exe"
 ) ELSE (
-  FOR %%I IN (java.exe) DO set JAVA=%%~$PATH:I
+  FOR %%I IN (java.exe) DO set JAVA="%%~$PATH:I"
 )
 IF NOT EXIST %JAVA% (
   ECHO Could not find any executable java binary. Please install java in your PATH or set JAVA_HOME 1>&2

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`IF DEFINED JAVA_HOME (`
`4`	`4`	`set JAVA="%JAVA_HOME%\bin\java.exe"`
`5`	`5`	`) ELSE (`
`6`		`- FOR %%I IN (java.exe) DO set JAVA=%%~$PATH:I`
	`6`	`+ FOR %%I IN (java.exe) DO set JAVA="%%~$PATH:I"`
`7`	`7`	`)`
`8`	`8`	`IF NOT EXIST %JAVA% (`
`9`	`9`	`ECHO Could not find any executable java binary. Please install java in your PATH or set JAVA_HOME 1>&2`