From c598c4cc974da8af183964634018efca1891e3de Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Thu, 2 Jul 2015 13:27:39 -0400 Subject: [PATCH] blind stab at windows --- core/bin/elasticsearch.in.bat | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/bin/elasticsearch.in.bat b/core/bin/elasticsearch.in.bat index 7a6bfda37ad..91a731e8260 100644 --- a/core/bin/elasticsearch.in.bat +++ b/core/bin/elasticsearch.in.bat @@ -88,5 +88,11 @@ set JAVA_OPTS=%JAVA_OPTS% -Dfile.encoding=UTF-8 REM Use our provided JNA always versus the system one set JAVA_OPTS=%JAVA_OPTS% -Djna.nosys=true -set ES_CLASSPATH=%ES_CLASSPATH%;%ES_HOME%/lib/${project.build.finalName}.jar;%ES_HOME%/lib/*;%ES_HOME%/lib/sigar/* +set CORE_CLASSPATH=%ES_HOME%/lib/${project.build.finalName}.jar;%ES_HOME%/lib/*;%ES_HOME%/lib/sigar/* +if "%ES_CLASSPATH%" == "" ( +set ES_CLASSPATH=%CORE_CLASSPATH% +) else ( +set ES_CLASSPATH=%ES_CLASSPATH%;%CORE_CLASSPATH% +) + set ES_PARAMS=-Delasticsearch -Des-foreground=yes -Des.path.home="%ES_HOME%"