Return-Path: X-Original-To: apmail-pig-commits-archive@www.apache.org Delivered-To: apmail-pig-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CE59098F4 for ; Sun, 4 Dec 2011 07:12:13 +0000 (UTC) Received: (qmail 94311 invoked by uid 500); 4 Dec 2011 07:12:13 -0000 Delivered-To: apmail-pig-commits-archive@pig.apache.org Received: (qmail 94267 invoked by uid 500); 4 Dec 2011 07:12:11 -0000 Mailing-List: contact commits-help@pig.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pig.apache.org Delivered-To: mailing list commits@pig.apache.org Received: (qmail 94260 invoked by uid 99); 4 Dec 2011 07:12:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Dec 2011 07:12:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Dec 2011 07:12:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 570DB23888FD for ; Sun, 4 Dec 2011 07:11:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1210061 - in /pig/branches/branch-0.9: CHANGES.txt bin/pig Date: Sun, 04 Dec 2011 07:11:48 -0000 To: commits@pig.apache.org From: daijy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111204071148.570DB23888FD@eris.apache.org> Author: daijy Date: Sun Dec 4 07:11:47 2011 New Revision: 1210061 URL: http://svn.apache.org/viewvc?rev=1210061&view=rev Log: PIG-2354: Several fixes for bin/pig 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=1210061&r1=1210060&r2=1210061&view=diff ============================================================================== --- pig/branches/branch-0.9/CHANGES.txt (original) +++ pig/branches/branch-0.9/CHANGES.txt Sun Dec 4 07:11:47 2011 @@ -22,6 +22,8 @@ Release 0.9.2 - Unreleased BUG FIXES +PIG-2354: Several fixes for bin/pig (daijy) + PIG-2379: Bug in Schema.getPigSchema(ResourceSchema rSchema) improperly adds two level access (jcoveney via dvryaboy) PIG-2320: Error: "projection with nothing to reference" (daijy) Modified: pig/branches/branch-0.9/bin/pig URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/bin/pig?rev=1210061&r1=1210060&r2=1210061&view=diff ============================================================================== --- pig/branches/branch-0.9/bin/pig (original) +++ pig/branches/branch-0.9/bin/pig Sun Dec 4 07:11:47 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