Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-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 08AA0430C for ; Wed, 8 Jun 2011 19:41:39 +0000 (UTC) Received: (qmail 47254 invoked by uid 500); 8 Jun 2011 19:41:38 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 47231 invoked by uid 500); 8 Jun 2011 19:41:38 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 47224 invoked by uid 99); 8 Jun 2011 19:41:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jun 2011 19:41:38 +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; Wed, 08 Jun 2011 19:41:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B22E923889C5; Wed, 8 Jun 2011 19:41:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1133524 - in /hadoop/common/branches/branch-0.20-security-205: CHANGES.txt bin/hadoop-config.sh Date: Wed, 08 Jun 2011 19:41:17 -0000 To: common-commits@hadoop.apache.org From: omalley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110608194117.B22E923889C5@eris.apache.org> Author: omalley Date: Wed Jun 8 19:41:17 2011 New Revision: 1133524 URL: http://svn.apache.org/viewvc?rev=1133524&view=rev Log: HADOOP-7356. Fix bin/hadoop scripts (eyang via omalley) Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt hadoop/common/branches/branch-0.20-security-205/bin/hadoop-config.sh Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt?rev=1133524&r1=1133523&r2=1133524&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Wed Jun 8 19:41:17 2011 @@ -83,6 +83,8 @@ Release 0.20.204.0 - unreleased BUG FIXES + HADOOP-7356. Fix bin/hadoop scripts (eyang via omalley) + MAPREDUCE-2316. Updated CapacityScheduler documentation. (acmurthy) MAPREDUCE-2447. Fix Child.java to set Task.jvmContext sooner to avoid Modified: hadoop/common/branches/branch-0.20-security-205/bin/hadoop-config.sh URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/bin/hadoop-config.sh?rev=1133524&r1=1133523&r2=1133524&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-205/bin/hadoop-config.sh (original) +++ hadoop/common/branches/branch-0.20-security-205/bin/hadoop-config.sh Wed Jun 8 19:41:17 2011 @@ -32,7 +32,11 @@ this="$bin/$script" # the root of the Hadoop installation export HADOOP_PREFIX=`dirname "$this"`/.. -export HADOOP_HOME=${HADOOP_PREFIX}/share/hadoop +if [ -d ${HADOOP_PREFIX}/share/hadoop ]; then + export HADOOP_HOME=${HADOOP_PREFIX}/share/hadoop +else + export HADOOP_HOME=${HADOOP_PREFIX} +fi #check to see if the conf dir is given as an optional argument if [ $# -gt 1 ]