Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-5221 bin/hbase script doesn't look for Hadoop jars in the right place in trunk layout 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1241952 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2012-02-08 15:56:48 +00:00
parent 38d28bccc6
commit 50f3e412a9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/hbase
View File

@ -227,13 +227,15 @@ if [ ! -z $HADOOP_HOME ]; then
if [ "`echo ${HADOOP_HOME}/hadoop-core*.jar`" != "${HADOOP_HOME}/hadoop-core*.jar" ] ; then if [ "`echo ${HADOOP_HOME}/hadoop-core*.jar`" != "${HADOOP_HOME}/hadoop-core*.jar" ] ; then
HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" `ls ${HADOOP_HOME}/hadoop-core*.jar | head -1`) HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" `ls ${HADOOP_HOME}/hadoop-core*.jar | head -1`)
else else
HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" `ls ${HADOOP_HOME}/hadoop-common*.jar | head -1`) HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" `ls ${HADOOP_HOME}/share/hadoop/common/hadoop-common*.jar | head -1`)
HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" `ls ${HADOOP_HOME}/hadoop-hdfs*.jar | head -1`) HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" `ls ${HADOOP_HOME}/share/hadoop/hdfs/hadoop-hdfs*.jar | head -1`)
HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" `ls ${HADOOP_HOME}/hadoop-mapred*.jar | head -1`)
fi fi
for i in "${HADOOP_HOME}/lib/"*.jar; do for i in "${HADOOP_HOME}/lib/"*.jar; do
HADOOPCPPATH="${HADOOPCPPATH}:$i" HADOOPCPPATH="${HADOOPCPPATH}:$i"
done done
if [ -d "${HADOOP_HOME}/share/hadoop/common/lib" ]; then
HADOOPCPPATH=${HADOOPCPPATH}:${HADOOP_HOME}/share/hadoop/common/lib'/*'
fi
CLASSPATH=$(append_path "${CLASSPATH}" "${HADOOPCPPATH}") CLASSPATH=$(append_path "${CLASSPATH}" "${HADOOPCPPATH}")
if [ -d "${HADOOP_HOME}/lib/native" ]; then if [ -d "${HADOOP_HOME}/lib/native" ]; then