From hcatalog-commits-return-745-apmail-incubator-hcatalog-commits-archive=incubator.apache.org@incubator.apache.org Wed Mar 14 23:32:29 2012 Return-Path: X-Original-To: apmail-incubator-hcatalog-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-hcatalog-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A698B9FD2 for ; Wed, 14 Mar 2012 23:32:29 +0000 (UTC) Received: (qmail 89055 invoked by uid 500); 14 Mar 2012 23:32:29 -0000 Delivered-To: apmail-incubator-hcatalog-commits-archive@incubator.apache.org Received: (qmail 89022 invoked by uid 500); 14 Mar 2012 23:32:29 -0000 Mailing-List: contact hcatalog-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hcatalog-dev@incubator.apache.org Delivered-To: mailing list hcatalog-commits@incubator.apache.org Received: (qmail 89015 invoked by uid 99); 14 Mar 2012 23:32:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Mar 2012 23:32:29 +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, 14 Mar 2012 23:32:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9A1832388D3B; Wed, 14 Mar 2012 23:32:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1300787 - in /incubator/hcatalog/branches/branch-0.4: CHANGES.txt bin/hcat Date: Wed, 14 Mar 2012 23:32:08 -0000 To: hcatalog-commits@incubator.apache.org From: gates@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120314233208.9A1832388D3B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gates Date: Wed Mar 14 23:32:08 2012 New Revision: 1300787 URL: http://svn.apache.org/viewvc?rev=1300787&view=rev Log: HCATALOG-305 hcat shell is not properly picking up the hcat jar Modified: incubator/hcatalog/branches/branch-0.4/CHANGES.txt incubator/hcatalog/branches/branch-0.4/bin/hcat Modified: incubator/hcatalog/branches/branch-0.4/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.4/CHANGES.txt?rev=1300787&r1=1300786&r2=1300787&view=diff ============================================================================== --- incubator/hcatalog/branches/branch-0.4/CHANGES.txt (original) +++ incubator/hcatalog/branches/branch-0.4/CHANGES.txt Wed Mar 14 23:32:08 2012 @@ -70,6 +70,8 @@ Release 0.4.0 - Unreleased OPTIMIZATIONS BUG FIXES + HCAT-305 hcat shell is not properly picking up the hcat jar (gates) + HCAT-307 NOTICE and LICENSE file need updated to add new jars and move copyright date to 2012 (gates) HCAT-300 A number of files lack Apache license headers (gates) Modified: incubator/hcatalog/branches/branch-0.4/bin/hcat URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.4/bin/hcat?rev=1300787&r1=1300786&r2=1300787&view=diff ============================================================================== --- incubator/hcatalog/branches/branch-0.4/bin/hcat (original) +++ incubator/hcatalog/branches/branch-0.4/bin/hcat Wed Mar 14 23:32:08 2012 @@ -59,7 +59,11 @@ done # Find our hcatalog jar shopt -s extglob -HCAT_JAR=$HCAT_PREFIX/share/hcatalog/hcatalog-!(*server-extensions*).jar +if (( `ls -1 $HCAT_PREFIX/share/hcatalog/hcatalog-[0-9]*.jar | wc -l` > 1 )) ; then + echo "Error: found more than one hcatalog jar in $HCAT_PREFIX/share/hcatalog" + exit 1 +fi +HCAT_JAR=`ls $HCAT_PREFIX/share/hcatalog/hcatalog-[0-9]*.jar` # Add all of the other jars to our classpath for jar in $HCAT_PREFIX/share/hcatalog/lib/*.jar ; do