You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2014/08/05 06:28:50 UTC

[2/3] git commit: HBASE-11668 Re-add HBASE_LIBRARY_PATH to bin/hbase (Esteban Gutierrez)

HBASE-11668 Re-add HBASE_LIBRARY_PATH to bin/hbase (Esteban Gutierrez)


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

Branch: refs/heads/branch-1
Commit: bd246347077b162f0e2888e75c517dd47587b35d
Parents: c634fc8
Author: Andrew Purtell <ap...@apache.org>
Authored: Mon Aug 4 21:26:17 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Mon Aug 4 21:27:57 2014 -0700

----------------------------------------------------------------------
 bin/hbase | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/bd246347/bin/hbase
----------------------------------------------------------------------
diff --git a/bin/hbase b/bin/hbase
index 6855cb6..ec0aabc 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -200,6 +200,11 @@ function append_path() {
 
 JAVA_PLATFORM=""
 
+# if HBASE_LIBRARY_PATH is defined lets use it as first or second option
+if [ "$HBASE_LIBRARY_PATH" != "" ]; then
+  JAVA_LIBRARY_PATH=$(append_path "$JAVA_LIBRARY_PATH" "$HBASE_LIBRARY_PATH")
+fi
+
 #If avail, add Hadoop to the CLASSPATH and to the JAVA_LIBRARY_PATH
 HADOOP_IN_PATH=$(PATH="${HADOOP_HOME:-${HADOOP_PREFIX}}/bin:$PATH" which hadoop 2>/dev/null)
 if [ -f ${HADOOP_IN_PATH} ]; then