diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-07 19:33:52 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-07 19:33:52 +0100 |
| commit | 674c51af3c0f3f1c65e1975893fdf6438bc57f28 (patch) | |
| tree | 3020861cf515bc567e191361357d42e11ac817ee /pkgs/servers/search/elasticsearch/es-home.patch | |
| parent | da437144fa4f446e91b5f7f78b55faa4d12de58a (diff) | |
| parent | d742d26b0d8c7125fb29417fcb40e2665e10100d (diff) | |
| download | nixlib-674c51af3c0f3f1c65e1975893fdf6438bc57f28.tar nixlib-674c51af3c0f3f1c65e1975893fdf6438bc57f28.tar.gz nixlib-674c51af3c0f3f1c65e1975893fdf6438bc57f28.tar.bz2 nixlib-674c51af3c0f3f1c65e1975893fdf6438bc57f28.tar.lz nixlib-674c51af3c0f3f1c65e1975893fdf6438bc57f28.tar.xz nixlib-674c51af3c0f3f1c65e1975893fdf6438bc57f28.tar.zst nixlib-674c51af3c0f3f1c65e1975893fdf6438bc57f28.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates
Diffstat (limited to 'pkgs/servers/search/elasticsearch/es-home.patch')
| -rw-r--r-- | pkgs/servers/search/elasticsearch/es-home.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/pkgs/servers/search/elasticsearch/es-home.patch b/pkgs/servers/search/elasticsearch/es-home.patch new file mode 100644 index 000000000000..f9e460198a98 --- /dev/null +++ b/pkgs/servers/search/elasticsearch/es-home.patch @@ -0,0 +1,20 @@ +diff -rc elasticsearch-0.20.5/bin/elasticsearch elasticsearch-0.20.5-new/bin/elasticsearch +*** elasticsearch-0.20.5/bin/elasticsearch 2013-03-07 12:16:31.152494626 +0100 +--- elasticsearch-0.20.5-new/bin/elasticsearch 2013-03-07 12:24:41.076081272 +0100 +*************** +*** 62,68 **** + done + + # determine elasticsearch home +! ES_HOME=`dirname "$SCRIPT"`/.. + + # make ELASTICSEARCH_HOME absolute + ES_HOME=`cd "$ES_HOME"; pwd` +--- 62,68 ---- + done + + # determine elasticsearch home +! ES_HOME=${ES_HOME:=`dirname "$SCRIPT"`/..} + + # make ELASTICSEARCH_HOME absolute + ES_HOME=`cd "$ES_HOME"; pwd` |