HBASE-5221 bin/hbase script doesn't look for Hadoop jars in the right place in trunk layout -- REVERTED
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1242027 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
7ef8f6e307
commit
ec7daf9413
|
@ -227,15 +227,13 @@ if [ ! -z $HADOOP_HOME ]; 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`)
|
||||
else
|
||||
HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" `ls ${HADOOP_HOME}/share/hadoop/common/hadoop-common*.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-common*.jar | head -1`)
|
||||
HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" `ls ${HADOOP_HOME}/hadoop-hdfs*.jar | head -1`)
|
||||
HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" `ls ${HADOOP_HOME}/hadoop-mapred*.jar | head -1`)
|
||||
fi
|
||||
for i in "${HADOOP_HOME}/lib/"*.jar; do
|
||||
HADOOPCPPATH="${HADOOPCPPATH}:$i"
|
||||
done
|
||||
if [ -d "${HADOOP_HOME}/share/hadoop/common/lib" ]; then
|
||||
HADOOPCPPATH=${HADOOPCPPATH}:${HADOOP_HOME}/share/hadoop/common/lib'/*'
|
||||
fi
|
||||
CLASSPATH=$(append_path "${CLASSPATH}" "${HADOOPCPPATH}")
|
||||
|
||||
if [ -d "${HADOOP_HOME}/lib/native" ]; then
|
||||
|
|
Loading…
Reference in New Issue