You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2011/12/04 08:12:59 UTC
svn commit: r1210064 - in /pig/trunk: CHANGES.txt bin/pig
Author: daijy
Date: Sun Dec 4 07:12:58 2011
New Revision: 1210064
URL: http://svn.apache.org/viewvc?rev=1210064&view=rev
Log:
PIG-2354: Several fixes for bin/pig
Modified:
pig/trunk/CHANGES.txt
pig/trunk/bin/pig
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1210064&r1=1210063&r2=1210064&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Sun Dec 4 07:12:58 2011
@@ -324,6 +324,8 @@ Release 0.9.2 - Unreleased
BUG FIXES
+PIG-2354: Several fixes for bin/pig (daijy)
+
PIG-2385: Store statements not getting processed (daijy)
PIG-2320: Error: "projection with nothing to reference" (daijy)
Modified: pig/trunk/bin/pig
URL: http://svn.apache.org/viewvc/pig/trunk/bin/pig?rev=1210064&r1=1210063&r2=1210064&view=diff
==============================================================================
--- pig/trunk/bin/pig (original)
+++ pig/trunk/bin/pig Sun Dec 4 07:12:58 2011
@@ -27,6 +27,8 @@
#
# HADOOP_HOME/HADOOP_PREFIX Environment HADOOP_HOME/HADOOP_PREFIX(0.20.205)
#
+# HADOOP_CONF_DIR Hadoop conf dir
+#
# PIG_HEAPSIZE The maximum amount of heap to use, in MB.
# Default is 1000.
#
@@ -109,6 +111,11 @@ if [ "$PIG_CLASSPATH" != "" ]; then
CLASSPATH=${CLASSPATH}:${PIG_CLASSPATH}
fi
+# add HADOOP_CONF_DIR
+if [ "$HADOOP_CONF_DIR" != "" ]; then
+ CLASSPATH=${CLASSPATH}:${HADOOP_CONF_DIR}
+fi
+
# so that filenames w/ spaces are handled correctly in loops below
IFS=
@@ -152,7 +159,11 @@ done
# done
#fi
-if [ -n "$HADOOP_PREFIX" ]; then
+if which hadoop >/dev/null; then
+ HADOOP_BIN=`which hadoop`
+fi
+
+if [[ -z "$HADOOP_BIN" && -n "$HADOOP_PREFIX" ]]; then
if [ -f $HADOOP_PREFIX/bin/hadoop ]; then
HADOOP_BIN=$HADOOP_PREFIX/bin/hadoop
fi
@@ -164,7 +175,7 @@ if [[ -z "$HADOOP_BIN" && -n "$HADOOP_HO
fi
fi
-if [ -n "$HADOOP_BIN" ]; then
+if [ -z "$HADOOP_BIN" ]; then
# if installed with rpm/deb package
if [ -f /usr/bin/hadoop ]; then
HADOOP_BIN=/usr/bin/hadoop