Return-Path: X-Original-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-accumulo-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 0859E9990 for ; Thu, 10 Nov 2011 20:21:50 +0000 (UTC) Received: (qmail 13622 invoked by uid 500); 10 Nov 2011 20:21:49 -0000 Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org Received: (qmail 13596 invoked by uid 500); 10 Nov 2011 20:21:49 -0000 Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: accumulo-dev@incubator.apache.org Delivered-To: mailing list accumulo-commits@incubator.apache.org Received: (qmail 13589 invoked by uid 99); 10 Nov 2011 20:21:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Nov 2011 20:21:49 +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; Thu, 10 Nov 2011 20:21:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7C67A23888FE; Thu, 10 Nov 2011 20:21:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1200526 - /incubator/accumulo/trunk/contrib/accumulo_sample/ingest/bin/ingest.sh Date: Thu, 10 Nov 2011 20:21:26 -0000 To: accumulo-commits@incubator.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111110202126.7C67A23888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ecn Date: Thu Nov 10 20:21:26 2011 New Revision: 1200526 URL: http://svn.apache.org/viewvc?rev=1200526&view=rev Log: ACCUMULO-130 make executable, fix pattern for file, port script to work on osx Modified: incubator/accumulo/trunk/contrib/accumulo_sample/ingest/bin/ingest.sh (contents, props changed) Modified: incubator/accumulo/trunk/contrib/accumulo_sample/ingest/bin/ingest.sh URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/contrib/accumulo_sample/ingest/bin/ingest.sh?rev=1200526&r1=1200525&r2=1200526&view=diff ============================================================================== --- incubator/accumulo/trunk/contrib/accumulo_sample/ingest/bin/ingest.sh (original) +++ incubator/accumulo/trunk/contrib/accumulo_sample/ingest/bin/ingest.sh Thu Nov 10 20:21:26 2011 @@ -17,8 +17,10 @@ -THIS_SCRIPT=`readlink -f $0` +THIS_SCRIPT="$0" SCRIPT_DIR="${THIS_SCRIPT%/*}" +SCRIPT_DIR=`cd $SCRIPT_DIR ; pwd` +echo $SCRIPT_DIR ACCUMULO_HOME=${ACCUMULO_HOME} ZOOKEEPER_HOME=${ZOOKEEPER_HOME} @@ -64,7 +66,7 @@ LIBJARS=`echo $CLASSPATH | sed 's/:/,/g' # # Map/Reduce job # -JAR=$SCRIPT_DIR/../lib/accumulo-sample-ingest-1.4.0-SNAPSHOT.jar +JAR=$SCRIPT_DIR/../lib/accumulo-sample-ingest-1.4.0-incubating-SNAPSHOT.jar CONF=$SCRIPT_DIR/../conf/wikipedia.xml HDFS_DATA_DIR=$1 export HADOOP_CLASSPATH=$CLASSPATH Propchange: incubator/accumulo/trunk/contrib/accumulo_sample/ingest/bin/ingest.sh ------------------------------------------------------------------------------ svn:executable = *