Author: tdunning
Date: Thu Oct 6 18:18:19 2011
New Revision: 1179740
URL: http://svn.apache.org/viewvc?rev=1179740&view=rev
Log:
MAHOUT-829 - Allowed for different location of conf directory as happens in the
packaged releases.
More temp files to be ignored.
Modified:
mahout/trunk/.gitignore
mahout/trunk/bin/mahout
Modified: mahout/trunk/.gitignore
URL:
http://svn.apache.org/viewvc/mahout/trunk/.gitignore?rev=1179740&r1=1179739&r2=1179740&view=diff
==============================================================================
--- mahout/trunk/.gitignore (original)
+++ mahout/trunk/.gitignore Thu Oct 6 18:18:19 2011
@@ -15,6 +15,8 @@ core/build/
core/input/
core/output/
core/testdata/
+core/temp
+temp
distribution/.settings/
examples/.settings/
foo
Modified: mahout/trunk/bin/mahout
URL:
http://svn.apache.org/viewvc/mahout/trunk/bin/mahout?rev=1179740&r1=1179739&r2=1179740&view=diff
==============================================================================
--- mahout/trunk/bin/mahout (original)
+++ mahout/trunk/bin/mahout Thu Oct 6 18:18:19 2011
@@ -105,7 +105,15 @@ if [ "$MAHOUT_HEAPSIZE" != "" ]; then
fi
if [ "x$MAHOUT_CONF_DIR" = "x" ]; then
- MAHOUT_CONF_DIR=$MAHOUT_HOME/src/conf
+ if [ -d $MAHOUT_HOME/src/conf ]; then
+ MAHOUT_CONF_DIR=$MAHOUT_HOME/src/conf
+ else
+ if [ -d $MAHOUT_HOME/conf ]; then
+ MAHOUT_CONF_DIR=$MAHOUT_HOME/conf
+ else
+ echo No MAHOUT_CONF_DIR found
+ fi
+ fi
fi
# CLASSPATH initially contains $MAHOUT_CONF_DIR, or defaults to
$MAHOUT_HOME/src/conf
