summary refs log tree commit diff
path: root/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/servers/search/elasticsearch/es-classpath-5.x.patch')
-rw-r--r--pkgs/servers/search/elasticsearch/es-classpath-5.x.patch9
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch b/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch
index 6898ffcf1d7..ccdca1e53af 100644
--- a/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch
+++ b/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch
@@ -32,3 +32,12 @@ diff -rupN a/bin/elasticsearch.in.sh b/bin/elasticsearch.in.sh
 -fi
 -
 -ES_CLASSPATH="$ES_HOME/lib/*"
+diff -rupN a/bin/elasticsearch-plugin b/bin/elasticsearch-plugin
+--- a/bin/elasticsearch-plugin	2018-04-13 01:21:55.000000000 +0900
++++ b/bin/elasticsearch-plugin	2018-06-28 19:08:54.700969245 +0900
+@@ -88,4 +88,4 @@ if [ -e "$CONF_DIR" ]; then
+   path_props=("${path_props[@]}" -Des.path.conf="$CONF_DIR")
+ fi
+ 
+-exec "$JAVA" $ES_JAVA_OPTS -Delasticsearch "${path_props[@]}" -cp "$ES_HOME/lib/*" org.elasticsearch.plugins.PluginCli "${args[@]}"
++exec "$JAVA" $ES_JAVA_OPTS -Delasticsearch "${path_props[@]}" -cp "$ES_CLASSPATH" org.elasticsearch.plugins.PluginCli "${args[@]}"