svn commit: r1136211 - in /pig/branches/branch-0.9: CHANGES.txt bin/pig

[ol...@apache.org]

Author: olga
Date: Wed Jun 15 21:47:41 2011
New Revision: 1136211

URL: http://svn.apache.org/viewvc?rev=1136211&view=rev
Log:
PIG-536: the shell script 'pig' does not work if PIG_HOME has the word 'hadoop' in it's directory (miguno via olgan)

Modified:
    pig/branches/branch-0.9/CHANGES.txt
    pig/branches/branch-0.9/bin/pig

Modified: pig/branches/branch-0.9/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/CHANGES.txt?rev=1136211&r1=1136210&r2=1136211&view=diff
==============================================================================
--- pig/branches/branch-0.9/CHANGES.txt (original)
+++ pig/branches/branch-0.9/CHANGES.txt Wed Jun 15 21:47:41 2011
@@ -34,6 +34,8 @@ PIG-1876: Typed map for Pig (daijy)
 
 IMPROVEMENTS
 
+PIG-536: the shell script 'pig' does not work if PIG_HOME has the word 'hadoop' in it's directory (miguno via olgan)
+
 PIG-1772: Pig 090 Documentation (chandec via olgan)
 
 PIG-1772: Pig 090 Documentation (chandec via olgan)

Modified: pig/branches/branch-0.9/bin/pig
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/bin/pig?rev=1136211&r1=1136210&r2=1136211&view=diff
==============================================================================
--- pig/branches/branch-0.9/bin/pig (original)
+++ pig/branches/branch-0.9/bin/pig Wed Jun 15 21:47:41 2011
@@ -144,7 +144,8 @@ PIG_HADOOP_VERSION="${PIG_HADOOP_VERSION
 # libraries in the lib dir, so don't blindly add them all.    Only add the one
 # that matche PIG_HADOOP_VERSION.
 for f in $PIG_HOME/lib/*.jar; do
-    IS_HADOOP=`echo $f | grep hadoop`
+    filename=`basename $f`
+    IS_HADOOP=`echo $filename | grep hadoop`
     if [ "${IS_HADOOP}x" == "x" ]; then
         CLASSPATH=${CLASSPATH}:$f;
     else