Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #22576 from andrewthad/elasticsearch_2_classpath
set elasticsearch classpath to nix store
- Loading branch information
Showing
2 changed files
with
42 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
diff -rupN a/bin/elasticsearch b/bin/elasticsearch | ||
--- a/bin/elasticsearch 2017-02-08 18:32:28.000298543 -0500 | ||
+++ b/bin/elasticsearch 2017-02-08 19:10:45.692916675 -0500 | ||
@@ -81,12 +81,7 @@ ES_HOME=`cd "$ES_HOME"; pwd` | ||
# 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-02-08 18:32:28.000298543 -0500 | ||
+++ b/bin/elasticsearch.in.sh 2017-02-08 18:33:46.816634599 -0500 | ||
@@ -1,17 +1,5 @@ | ||
#!/bin/sh | ||
|
||
-# 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/elasticsearch-2.4.4.jar:$ES_HOME/lib/*" | ||
- | ||
if [ "x$ES_MIN_MEM" = "x" ]; then | ||
ES_MIN_MEM=256m | ||
fi |