honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-01 00:19:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12001 from rmuir/no_dont_do_that

Browse Source 
Don't add CWD to classpath when ES_CLASSPATH isn't set.
This commit is contained in:
Robert Muir 2015-07-02 14:53:24 -04:00
commit 3171f52461
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/bin/elasticsearch.in.bat
View File

Binary file not shown.

8
core/bin/elasticsearch.in.sh
View File

@ -1,6 +1,12 @@
#!/bin/sh #!/bin/sh
ES_CLASSPATH="$ES_CLASSPATH:$ES_HOME/lib/${project.build.finalName}.jar:$ES_HOME/lib/*:$ES_HOME/lib/sigar/*" CORE_CLASSPATH="$ES_HOME/lib/${project.build.finalName}.jar:$ES_HOME/lib/*:$ES_HOME/lib/sigar/*"
if [ "x$ES_CLASSPATH" = "x" ]; then
ES_CLASSPATH="$CORE_CLASSPATH"
else
ES_CLASSPATH="$ES_CLASSPATH:$CORE_CLASSPATH"
fi
if [ "x$ES_MIN_MEM" = "x" ]; then if [ "x$ES_MIN_MEM" = "x" ]; then
ES_MIN_MEM=${packaging.elasticsearch.heap.min} ES_MIN_MEM=${packaging.elasticsearch.heap.min}