From 75213b3bdbd689f18ef00f7d9ef83521b44d8423 Mon Sep 17 00:00:00 2001
From: Ron DuPlain <ron.duplain@gmail.com>
Date: Thu, 30 Jan 2014 13:17:17 -0500
Subject: [PATCH] Add ES_HOME to ES_INCLUDE search path.

---
 bin/elasticsearch | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/elasticsearch b/bin/elasticsearch
index e3eb514da3c0d..3dbeb057a049a 100755
--- a/bin/elasticsearch
+++ b/bin/elasticsearch
@@ -83,12 +83,13 @@ 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
+if [ -z "$ES_INCLUDE" ]; 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
         if [ -r "$include" ]; then
             . "$include"