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 BD7204D86 for ; Wed, 8 Jun 2011 21:54:42 +0000 (UTC) Received: (qmail 95060 invoked by uid 500); 8 Jun 2011 21:54:42 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 95035 invoked by uid 500); 8 Jun 2011 21:54:42 -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 95028 invoked by uid 99); 8 Jun 2011 21:54:42 -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 21:54:42 +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 21:54:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 84B2523889C5; Wed, 8 Jun 2011 21:54:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1133574 - /hadoop/common/branches/branch-0.20-security/bin/hadoop-config.sh Date: Wed, 08 Jun 2011 21:54:21 -0000 To: common-commits@hadoop.apache.org From: omalley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110608215421.84B2523889C5@eris.apache.org> Author: omalley Date: Wed Jun 8 21:54:21 2011 New Revision: 1133574 URL: http://svn.apache.org/viewvc?rev=1133574&view=rev Log: HADOOP-7356. Fix bin/hadoop scripts (eyang via omalley) Minor tweak of fix to check Modified: hadoop/common/branches/branch-0.20-security/bin/hadoop-config.sh Modified: hadoop/common/branches/branch-0.20-security/bin/hadoop-config.sh URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/bin/hadoop-config.sh?rev=1133574&r1=1133573&r2=1133574&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security/bin/hadoop-config.sh (original) +++ hadoop/common/branches/branch-0.20-security/bin/hadoop-config.sh Wed Jun 8 21:54:21 2011 @@ -32,7 +32,7 @@ this="$bin/$script" # the root of the Hadoop installation export HADOOP_PREFIX=`dirname "$this"`/.. -if [ -d ${HADOOP_PREFIX}/share/hadoop ]; then +if [ -d ${HADOOP_PREFIX}/share/hadoop/bin ]; then export HADOOP_HOME=${HADOOP_PREFIX}/share/hadoop else export HADOOP_HOME=${HADOOP_PREFIX}