commit 0689ede612228d4c3abeb23e8f211d9ea9768f16 Author: Todd Lipcon Date: Wed Jan 12 13:32:54 2011 -0800 HBASE-3533. Allow HBASE_LIBRARY_PATH to point to libs Author: Todd Lipcon diff --git bin/hbase bin/hbase index afd7a2e..c44084b 100755 --- bin/hbase +++ bin/hbase @@ -181,21 +181,26 @@ if $cygwin; then HBASE_HOME=`cygpath -d "$HBASE_HOME"` HBASE_LOG_DIR=`cygpath -d "$HBASE_LOG_DIR"` fi + +function append_path() { + if [ -z "$1" ]; then + echo $2 + else + echo $1:$2 + fi +} + # setup 'java.library.path' for native-hadoop code if necessary -JAVA_LIBRARY_PATH='' +JAVA_LIBRARY_PATH="$HBASE_LIBRARY_PATH" if [ -d "${HBASE_HOME}/build/native" -o -d "${HBASE_HOME}/lib/native" ]; then JAVA_PLATFORM=`CLASSPATH=${CLASSPATH} ${JAVA} org.apache.hadoop.util.PlatformName | sed -e "s/ /_/g"` if [ -d "$HBASE_HOME/build/native" ]; then - JAVA_LIBRARY_PATH=${HBASE_HOME}/build/native/${JAVA_PLATFORM}/lib + JAVA_LIBRARY_PATH=$(append_path "$JAVA_LIBRARY_PATH" ${HBASE_HOME}/build/native/${JAVA_PLATFORM}/lib) fi if [ -d "${HBASE_HOME}/lib/native" ]; then - if [ "x$JAVA_LIBRARY_PATH" != "x" ]; then - JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:${HBASE_HOME}/lib/native/${JAVA_PLATFORM} - else - JAVA_LIBRARY_PATH=${HBASE_HOME}/lib/native/${JAVA_PLATFORM} - fi + JAVA_LIBRARY_PATH=$(append_path "$JAVA_LIBRARY_PATH" ${HBASE_HOME}/lib/native/${JAVA_PLATFORM}) fi fi