Author: ab Date: Wed Mar 7 11:02:56 2007 New Revision: 515698 URL: http://svn.apache.org/viewvc?view=rev&rev=515698 Log: NUTCH-432 - JAVA_PLATFORM with spaces breaks bin/nutch.
Also, apply the patch proposed in HADOOP-1080 to fix CLASSPATH problems under Cygwin. Modified: lucene/nutch/trunk/CHANGES.txt lucene/nutch/trunk/bin/nutch Modified: lucene/nutch/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/CHANGES.txt?view=diff&rev=515698&r1=515697&r2=515698 ============================================================================== --- lucene/nutch/trunk/CHANGES.txt (original) +++ lucene/nutch/trunk/CHANGES.txt Wed Mar 7 11:02:56 2007 @@ -148,6 +148,9 @@ 49. NUTCH-449 - Make junit output format configurable. (nigel via cutting) +50. NUTCH-432 - Fix a bug where platform name with spaces would break the + bin/nutch script. (Brian Whitman via ab) + Release 0.8 - 2006-07-25 Modified: lucene/nutch/trunk/bin/nutch URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/bin/nutch?view=diff&rev=515698&r1=515697&r2=515698 ============================================================================== --- lucene/nutch/trunk/bin/nutch (original) +++ lucene/nutch/trunk/bin/nutch Wed Mar 7 11:02:56 2007 @@ -125,11 +125,15 @@ CLASSPATH=${CLASSPATH}:$f; done +# cygwin path translation +if $cygwin; then + CLASSPATH=`cygpath -p -w "$CLASSPATH"` +fi # setup 'java.library.path' for native-hadoop code if necessary JAVA_LIBRARY_PATH='' if [ -d "${NUTCH_HOME}/build/native" -o -d "${NUTCH_HOME}/lib/native" ]; then - JAVA_PLATFORM=`CLASSPATH=${CLASSPATH} ${JAVA} org.apache.hadoop.util.PlatformName` + JAVA_PLATFORM=`CLASSPATH=${CLASSPATH} ${JAVA} org.apache.hadoop.util.PlatformName | sed -e 's/ /_/g'` if [ -d "$NUTCH_HOME/build/native" ]; then JAVA_LIBRARY_PATH=${HADOOP_HOME}/build/native/${JAVA_PLATFORM}/lib @@ -144,6 +148,10 @@ fi fi +if [ $cygwin -a "X${JAVA_LIBRARY_PATH}" != "X" ]; then + JAVA_LIBRARY_PATH=`cygpath -p -w "$JAVA_LIBRARY_PATH"` +fi + # restore ordinary behaviour unset IFS @@ -215,11 +223,6 @@ CLASS='org.apache.nutch.searcher.DistributedSearch$Server' else CLASS=$COMMAND -fi - -# cygwin path translation -if $cygwin; then - CLASSPATH=`cygpath -p -w "$CLASSPATH"` fi # run it