svn commit: r986659 - /mahout/trunk/bin/mahout

[dr...@apache.org]

Author: drew
Date: Wed Aug 18 13:19:19 2010
New Revision: 986659

URL: http://svn.apache.org/viewvc?rev=986659&view=rev
Log:
MAHOUT-482: Defaulting $HADOOP_CONF_DIR to $HADOOP_HOME/conf via Joe Prasanna Kumar

Modified:
    mahout/trunk/bin/mahout

Modified: mahout/trunk/bin/mahout
URL: http://svn.apache.org/viewvc/mahout/trunk/bin/mahout?rev=986659&r1=986658&r2=986659&view=diff
==============================================================================
--- mahout/trunk/bin/mahout (original)
+++ mahout/trunk/bin/mahout Wed Aug 18 13:19:19 2010
@@ -192,15 +192,22 @@ fi
 
 # run it
 
-if [ "$HADOOP_CONF_DIR" = "" ] || [ "$HADOOP_HOME" = "" ] || [ "$MAHOUT_LOCAL" != "" ] ; then
-  if [ "$HADOOP_CONF_DIR" = "" ] || [ "$HADOOP_HOME" = "" ] ; then
-    echo "no HADOOP_CONF_DIR or HADOOP_HOME set, running locally"
+if [ "$HADOOP_HOME" = "" ] || [ "$MAHOUT_LOCAL" != "" ] ; then
+  if [ "$HADOOP_HOME" = "" ] ; then
+    echo "no HADOOP_HOME set, running locally"
   elif [ "$MAHOUT_LOCAL" != "" ] ; then 
     echo "MAHOUT_LOCAL is set, running locally"
   fi
   exec "$JAVA" $JAVA_HEAP_MAX $MAHOUT_OPTS -classpath "$CLASSPATH" $CLASS "$@"
 else
-  echo "running on hadoop, using HADOOP_HOME=$HADOOP_HOME and HADOOP_CONF_DIR=$HADOOP_CONF_DIR"
+  echo "Running on hadoop, using HADOOP_HOME=$HADOOP_HOME"
+  if [ "$HADOOP_CONF_DIR" = "" ] ; then
+    HADOOP_CONF_DIR=$HADOOP_HOME/conf
+    echo "No HADOOP_CONF_DIR set, using $HADOOP_HOME/conf "
+  else 
+    echo "HADOOP_CONF_DIR=$HADOOP_CONF_DIR"
+  fi
+	
   if [ "$MAHOUT_JOB" = "" ] ; then
     echo "ERROR: Could not find mahout-examples-*.job in $MAHOUT_HOME or $MAHOUT_HOME/examples/target, please run 'mvn install' to create the .job file"
     exit 1