35 lines
1.5 KiB
Diff
35 lines
1.5 KiB
Diff
|
diff -rupN a/bin/elasticsearch b/bin/elasticsearch
|
||
|
|
--- a/bin/elasticsearch 2017-05-17 10:53:49.444487071 +0200
|
||
|
|
+++ b/bin/elasticsearch 2017-05-17 10:55:52.755081523 +0200
|
||
|
|
@@ -129,12 +129,7 @@ ES_JAVA_OPTS="$(parse_jvm_options "$ES_J
|
||
|
|
# If an include wasn't specified in the environment, then search for one...
|
||
|
|
if [ "x$ES_INCLUDE" = "x" ]; then
|
||
|
|
# Locations (in order) to use when searching for an include file.
|
||
|
|
- for include in /usr/share/elasticsearch/elasticsearch.in.sh \
|
||
|
|
- /usr/local/share/elasticsearch/elasticsearch.in.sh \
|
||
|
|
- /opt/elasticsearch/elasticsearch.in.sh \
|
||
|
|
- ~/.elasticsearch.in.sh \
|
||
|
|
- "$ES_HOME/bin/elasticsearch.in.sh" \
|
||
|
|
- "`dirname "$0"`"/elasticsearch.in.sh; do
|
||
|
|
+ for include in "`dirname "$0"`"/elasticsearch.in.sh; do
|
||
|
|
if [ -r "$include" ]; then
|
||
|
|
. "$include"
|
||
|
|
break
|
||
|
|
diff -rupN a/bin/elasticsearch.in.sh b/bin/elasticsearch.in.sh
|
||
|
|
--- a/bin/elasticsearch.in.sh 2017-04-28 19:41:47.000000000 +0200
|
||
|
|
+++ b/bin/elasticsearch.in.sh 2017-05-17 10:56:49.303519788 +0200
|
||
|
|
@@ -1,13 +1 @@
|
||
|
|
#!/bin/bash
|
||
|
|
-
|
||
|
|
-# check in case a user was using this mechanism
|
||
|
|
-if [ "x$ES_CLASSPATH" != "x" ]; then
|
||
|
|
- cat >&2 << EOF
|
||
|
|
-Error: Don't modify the classpath with ES_CLASSPATH. Best is to add
|
||
|
|
-additional elements via the plugin mechanism, or if code must really be
|
||
|
|
-added to the main classpath, add jars to lib/ (unsupported).
|
||
|
|
-EOF
|
||
|
|
- exit 1
|
||
|
|
-fi
|
||
|
|
-
|
||
|
|
-ES_CLASSPATH="$ES_HOME/lib/*"
|