You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sr...@apache.org on 2011/10/20 12:24:02 UTC
svn commit: r1186717 - /mahout/trunk/bin/mahout
Author: srowen
Date: Thu Oct 20 10:24:02 2011
New Revision: 1186717
URL: http://svn.apache.org/viewvc?rev=1186717&view=rev
Log:
MAHOUT-828
Modified:
mahout/trunk/bin/mahout
Modified: mahout/trunk/bin/mahout
URL: http://svn.apache.org/viewvc/mahout/trunk/bin/mahout?rev=1186717&r1=1186716&r2=1186717&view=diff
==============================================================================
--- mahout/trunk/bin/mahout (original)
+++ mahout/trunk/bin/mahout Thu Oct 20 10:24:02 2011
@@ -198,7 +198,13 @@ if [ "$HADOOP_HOME" = "" ] || [ "$MAHOUT
echo "MAHOUT_LOCAL is set, running locally"
fi
# echo "CLASSPATH: $CLASSPATH"
- exec "$JAVA" $JAVA_HEAP_MAX $MAHOUT_OPTS -classpath "$CLASSPATH" $CLASS "$@"
+ case $1 in
+ (classpath)
+ echo $CLASSPATH
+ ;;
+ (*)
+ exec "$JAVA" $JAVA_HEAP_MAX $MAHOUT_OPTS -classpath "$CLASSPATH" $CLASS "$@"
+ esac
else
echo "Running on hadoop, using HADOOP_HOME=$HADOOP_HOME"
if [ "$HADOOP_CONF_DIR" = "" ] ; then
@@ -212,13 +218,18 @@ else
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
else
- if [ "$1" = "hadoop" ]; then
+ case "$1" in
+ (hadoop)
export HADOOP_CLASSPATH=$MAHOUT_CONF_DIR:${HADOOP_CLASSPATH}:$CLASSPATH
exec "$HADOOP_HOME/bin/$@"
- else
+ ;;
+ (classpath)
+ echo $CLASSPATH
+ ;;
+ (*)
echo "MAHOUT-JOB: $MAHOUT_JOB"
export HADOOP_CLASSPATH=$MAHOUT_CONF_DIR:${HADOOP_CLASSPATH}
exec "$HADOOP_HOME/bin/hadoop" --config $HADOOP_CONF_DIR jar $MAHOUT_JOB $CLASS "$@"
- fi
+ esac
fi
fi