Clearer error message - installing windows service (#33804)

nogginbox · danielmitterdorfer · commit ceb70519e4dc · 2019-03-04T15:13:09.000+01:00
The error message reports it can not find a file in a directory it was not looking for it in.

I've updated the message so it makes it clearer what JAVA_HOME is set to and which directories it tried to find jvm.dll in
diff --git a/distribution/src/bin/elasticsearch-service.bat b/distribution/src/bin/elasticsearch-service.bat
@@ -98,7 +98,7 @@ if exist "%JAVA_HOME%\bin\server\jvm.dll" (
 	set JVM_DLL=\bin\server\jvm.dll
 	goto foundJVM
 ) else (
-  	echo JAVA_HOME points to an invalid Java installation (no jvm.dll found in "%JAVA_HOME%"^). Exiting...
+  	echo JAVA_HOME ("%JAVA_HOME%"^) points to an invalid Java installation (no jvm.dll found in "%JAVA_HOME%\jre\bin\server" or "%JAVA_HOME%\bin\server"^). Exiting...
   	goto:eof
 )
 

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ if exist "%JAVA_HOME%\bin\server\jvm.dll" (`
`98`	`98`	`set JVM_DLL=\bin\server\jvm.dll`
`99`	`99`	`goto foundJVM`
`100`	`100`	`) else (`
`101`		`- echo JAVA_HOME points to an invalid Java installation (no jvm.dll found in "%JAVA_HOME%"^). Exiting...`
	`101`	`+ echo JAVA_HOME ("%JAVA_HOME%"^) points to an invalid Java installation (no jvm.dll found in "%JAVA_HOME%\jre\bin\server" or "%JAVA_HOME%\bin\server"^). Exiting...`
`102`	`102`	`goto:eof`
`103`	`103`	`)`
`104`	`104`