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 960CA10EF7 for ; Sun, 22 Sep 2013 19:06:32 +0000 (UTC) Received: (qmail 97647 invoked by uid 500); 22 Sep 2013 19:06:32 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 97581 invoked by uid 500); 22 Sep 2013 19:06:29 -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 97574 invoked by uid 99); 22 Sep 2013 19:06:28 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Sep 2013 19:06:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E85FE8B0910; Sun, 22 Sep 2013 19:06:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: ACCUMULO-1492 Add the -H option to `find` to follow symlinks when looking for the log4j jar. Date: Sun, 22 Sep 2013 19:06:27 +0000 (UTC) Updated Branches: refs/heads/1.5.1-SNAPSHOT 5da415ae7 -> 51dcfd8c2 ACCUMULO-1492 Add the -H option to `find` to follow symlinks when looking for the log4j jar. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/51dcfd8c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/51dcfd8c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/51dcfd8c Branch: refs/heads/1.5.1-SNAPSHOT Commit: 51dcfd8c257283e638d02399949868af95e2b2f3 Parents: 5da415a Author: Josh Elser Authored: Sun Sep 22 14:20:24 2013 -0400 Committer: Josh Elser Committed: Sun Sep 22 14:20:24 2013 -0400 ---------------------------------------------------------------------- bin/accumulo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/51dcfd8c/bin/accumulo ---------------------------------------------------------------------- diff --git a/bin/accumulo b/bin/accumulo index 4ffed5c..1d1040e 100755 --- a/bin/accumulo +++ b/bin/accumulo @@ -80,7 +80,7 @@ logger) export ACCUMULO_OPTS="${ACCUMULO_GENERAL_OPTS} ${ACCUMULO_LOGGER_OPTS}" esac XML_FILES="${ACCUMULO_CONF_DIR}" -LOG4J_JAR=$(find "${HADOOP_PREFIX}/lib" "${HADOOP_PREFIX}"/share/hadoop/common/lib -name 'log4j*.jar' -print 2>/dev/null | head -1) +LOG4J_JAR=$(find -H "${HADOOP_PREFIX}/lib" "${HADOOP_PREFIX}"/share/hadoop/common/lib -name 'log4j*.jar' -print 2>/dev/null | head -1) CLASSPATH="${XML_FILES}:${START_JAR}:${LOG4J_JAR}" if [ -z "${JAVA_HOME}" -o ! -d "${JAVA_HOME}" ]; then