accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [1/2] 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:07:19 GMT
Updated Branches:
  refs/heads/master cf41bdcc2 -> 5b2a58257


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/master
Commit: 51dcfd8c257283e638d02399949868af95e2b2f3
Parents: 5da415a
Author: Josh Elser <elserj@apache.org>
Authored: Sun Sep 22 14:20:24 2013 -0400
Committer: Josh Elser <elserj@apache.org>
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


Mime
View raw message