Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 56A1A102B7 for ; Tue, 5 Aug 2014 04:28:50 +0000 (UTC) Received: (qmail 4031 invoked by uid 500); 5 Aug 2014 04:28:50 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 3945 invoked by uid 500); 5 Aug 2014 04:28:50 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 3814 invoked by uid 99); 5 Aug 2014 04:28:50 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Aug 2014 04:28:50 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A9D839226D7; Tue, 5 Aug 2014 04:28:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: apurtell@apache.org To: commits@hbase.apache.org Date: Tue, 05 Aug 2014 04:28:50 -0000 Message-Id: In-Reply-To: <779e6c43c5e9417db631dd43fd17d6d4@git.apache.org> References: <779e6c43c5e9417db631dd43fd17d6d4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Mon Aug 4 21:26:17 2014 -0700 Committer: Andrew Purtell 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