accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwa...@apache.org
Subject [accumulo] branch 1.9 updated: #859 - Fix CLASSPATH bug causing cur dir to be added (#864)
Date Fri, 04 Jan 2019 19:33:30 GMT
This is an automated email from the ASF dual-hosted git repository.

mwalch pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.9 by this push:
     new c8b4132  #859 - Fix CLASSPATH bug causing cur dir to be added (#864)
c8b4132 is described below

commit c8b413261530017faed40c5d86930da017e4292f
Author: Mike Walch <mwalch@apache.org>
AuthorDate: Fri Jan 4 14:33:26 2019 -0500

    #859 - Fix CLASSPATH bug causing cur dir to be added (#864)
---
 assemble/bin/accumulo | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/assemble/bin/accumulo b/assemble/bin/accumulo
index a0fc17b..18e0571 100755
--- a/assemble/bin/accumulo
+++ b/assemble/bin/accumulo
@@ -122,7 +122,11 @@ if [ -z "${LOG4J_JAR}" -a -z "${CLASSPATH}" ]; then
    exit 1
 fi
 
-CLASSPATH="${XML_FILES}:${START_JAR}:${SLF4J_JARS}:${LOG4J_JAR}:${CLASSPATH}"
+if [[ -n "$CLASSPATH" ]]; then
+  CLASSPATH="${XML_FILES}:${START_JAR}:${SLF4J_JARS}:${LOG4J_JAR}:${CLASSPATH}"
+else
+  CLASSPATH="${XML_FILES}:${START_JAR}:${SLF4J_JARS}:${LOG4J_JAR}"
+fi
 
 if [ -z "${JAVA_HOME}" -o ! -d "${JAVA_HOME}" ]; then
    echo "JAVA_HOME is not set or is not a directory.  Please make sure it's set globally
or in conf/accumulo-env.sh"


Mime
View raw message