[3/3] drill git commit: DRILL-4822: Add site directory to distrib-env.sh search path

[su...@apache.org]

DRILL-4822: Add site directory to distrib-env.sh search path

closes #558


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/4bd67a66
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/4bd67a66
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/4bd67a66

Branch: refs/heads/master
Commit: 4bd67a66073a429fb19c4f21f4113fef8a24db21
Parents: 8bbf658
Author: Paul Rogers <pr...@maprtech.com>
Authored: Tue Aug 2 15:16:03 2016 -0700
Committer: Sudheesh Katkam <sk...@maprtech.com>
Committed: Fri Aug 5 17:37:14 2016 -0700

----------------------------------------------------------------------
 distribution/src/resources/drill-config.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/4bd67a66/distribution/src/resources/drill-config.sh
----------------------------------------------------------------------
diff --git a/distribution/src/resources/drill-config.sh b/distribution/src/resources/drill-config.sh
index de37162..bdf3889 100644
--- a/distribution/src/resources/drill-config.sh
+++ b/distribution/src/resources/drill-config.sh
@@ -166,10 +166,17 @@ fi
 # Source distrib-env.sh for any distribution-specific settings.
 # distrib-env.sh is optional; it is created by some distribution installers
 # that need distribution-specific settings.
+# Because installers write site-specific values into the file, the file
+# should be moved into the site directory, if the user employs one.
 
-distribEnv="$DRILL_HOME/conf/distrib-env.sh"
+distribEnv="$DRILL_CONF_DIR/distrib-env.sh"
 if [ -r "$distribEnv" ]; then
   . "$distribEnv"
+else
+  distribEnv="$DRILL_HOME/conf/distrib-env.sh"
+  if [ -r "$distribEnv" ]; then
+    . "$distribEnv"
+  fi
 fi
 
 # Default memory settings if none provided by the environment or