|
@@ -163,10 +163,6 @@ fi
|
|
|
# CLASSPATH initially contains $HADOOP_CONF_DIR
|
|
|
CLASSPATH="${HADOOP_CONF_DIR}"
|
|
|
|
|
|
-if [ "$HADOOP_USER_CLASSPATH_FIRST" != "" ] && [ "$HADOOP_CLASSPATH" != "" ] ; then
|
|
|
- CLASSPATH=${CLASSPATH}:${HADOOP_CLASSPATH}
|
|
|
-fi
|
|
|
-
|
|
|
# so that filenames w/ spaces are handled correctly in loops below
|
|
|
IFS=
|
|
|
|
|
@@ -187,11 +183,6 @@ fi
|
|
|
|
|
|
CLASSPATH=${CLASSPATH}:$HADOOP_COMMON_HOME/$HADOOP_COMMON_DIR'/*'
|
|
|
|
|
|
-# add user-specified CLASSPATH last
|
|
|
-if [ "$HADOOP_USER_CLASSPATH_FIRST" = "" ] && [ "$HADOOP_CLASSPATH" != "" ]; then
|
|
|
- CLASSPATH=${CLASSPATH}:${HADOOP_CLASSPATH}
|
|
|
-fi
|
|
|
-
|
|
|
# default log directory & file
|
|
|
if [ "$HADOOP_LOG_DIR" = "" ]; then
|
|
|
HADOOP_LOG_DIR="$HADOOP_PREFIX/logs"
|