Skip to content

Commit

Permalink
Merge pull request #215 from Factual/feature/fix_hadoop_classpath
Browse files Browse the repository at this point in the history
Use `hadoop classpath` to set HADOOP_CLASSPATH even if HADOOP_CLASSPA…
  • Loading branch information
Aaron Crow committed May 18, 2016
2 parents f1676ed + 6ea1381 commit 3659c11
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions bin/drake
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,9 @@ fi
# Tries to include local hadoop library on classpath for HDFS support.
# If Hadoop client is not installed locally, defaults to built-in hadoop version.
# If you don't need HDFS support with your Drake workflows, none of this matters.
if [ -z ${HADOOP_CLASSPATH:+x} ]; then
if [[ `which hadoop` ]]; then
HADOOP_CLASSPATH=`hadoop classpath 2>/dev/null`
HADOOP_VERSION=`hadoop version | head -1`
fi
if [[ `which hadoop` ]]; then
HADOOP_CLASSPATH=`hadoop classpath 2>/dev/null`
HADOOP_VERSION=`hadoop version | head -1`
fi

if [ "$1" = "--hadoop-version" ]; then
Expand Down

0 comments on commit 3659c11

Please sign in to comment.