Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 07734E468 for ; Wed, 2 Jan 2013 20:34:10 +0000 (UTC) Received: (qmail 74933 invoked by uid 500); 2 Jan 2013 20:34:10 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 74897 invoked by uid 500); 2 Jan 2013 20:34:09 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 74890 invoked by uid 99); 2 Jan 2013 20:34:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2013 20:34:09 +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, 02 Jan 2013 20:34:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3A676238897A; Wed, 2 Jan 2013 20:33:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1428004 - /accumulo/trunk/bin/accumulo Date: Wed, 02 Jan 2013 20:33:47 -0000 To: commits@accumulo.apache.org From: vines@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130102203347.3A676238897A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vines Date: Wed Jan 2 20:33:46 2013 New Revision: 1428004 URL: http://svn.apache.org/viewvc?rev=1428004&view=rev Log: ACCUMULO-832 - accumulo script will now make ACCUMULO_LOG_DIR if it does not exist. Explicit check for ACCUMULO_LOG_DIR to be set Modified: accumulo/trunk/bin/accumulo Modified: accumulo/trunk/bin/accumulo URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/accumulo?rev=1428004&r1=1428003&r2=1428004&view=diff ============================================================================== --- accumulo/trunk/bin/accumulo (original) +++ accumulo/trunk/bin/accumulo Wed Jan 2 20:33:46 2013 @@ -71,16 +71,24 @@ XML_FILES=${ACCUMULO_HOME}/conf CLASSPATH=${XML_FILES}:${START_JAR}:${COMMONS_JCI_JARS}:${COMMONS_VFS_JARS}:${HADOOP_CLASSPATH} if [ -z $JAVA_HOME -o ! -d $JAVA_HOME ]; then - echo "JAVA_HOME is not set. Please make sure it's set globally or in conf/accumulo-env.sh" - exit 1 + echo "JAVA_HOME is not set. Please make sure it's set globally or in conf/accumulo-env.sh" + exit 1 fi if [ -z $HADOOP_HOME -o ! -d $HADOOP_HOME ]; then - echo "HADOOP_HOME is not set. Please make sure it's set globally or in conf/accumulo-env.sh" - exit 1 + echo "HADOOP_HOME is not set. Please make sure it's set globally or in conf/accumulo-env.sh" + exit 1 fi if [ -z $ZOOKEEPER_HOME -o ! -d $ZOOKEEPER_HOME ]; then - echo "ZOOKEEPER_HOME is not set. Please make sure it's set globally or in conf/accumulo-env.sh" - exit 1 + echo "ZOOKEEPER_HOME is not set. Please make sure it's set globally or in conf/accumulo-env.sh" + exit 1 +fi +if [ -z $ACCUMULO_LOG_DIR ]; then + echo "ACCUMULO_LOG_DIR is not set. Please make sure it's set globally or in conf/accumulo-env.sh" + exit 1 +fi + +if [ ! -d "$ACCUMULO_LOG_DIR" ]; then + mkdir $ACCUMULO_LOG_DIR; fi #Export the variables just in case they are not exported