fix issue with log4j in rpm install (#1890)

locationtech · May 23, 2022 · d4d63db · d4d63db
1 parent 6de74e5
commit d4d63db
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/deploy/packaging/rpm/centos/7/SOURCES/geowave-tools.sh b/deploy/packaging/rpm/centos/7/SOURCES/geowave-tools.sh
@@ -40,7 +40,7 @@ if [ -n "${HADOOP_HOME}" ] && [ -d "${HADOOP_HOME}" ]; then
      HADOOP_CLASSPATH=""
      for i in $(echo $CLASSPATH | sed "s/:/ /g")
      do
-       if [[ "$i" != *log4j-slf4j-impl*.jar ]]; then
+       if [[ "$i" != *log4j-slf4j-impl*.jar && "$i" != *slf4j-log4j*.jar ]]; then
          HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:$i
        fi
      done
@@ -67,9 +67,9 @@ fi
 if [ -n "${SPARK_HOME}" ] && [ -d "${SPARK_HOME}" ]; then
   . "${SPARK_HOME}"/bin/load-spark-env.sh
   SPARK_CLASSPATH=""
-  for i in $(ls ${SPARK_HOME}/jars/* )
+  for i in ${SPARK_HOME}/jars/*.jar
   do
-     if [[ "$i" != *log4j-slf4j-impl*.jar && "$i" != *guava*.jar ]]; then
+     if [[ "$i" != *log4j-slf4j-impl*.jar && "$i" != *guava*.jar && "$i" != *slf4j-log4j*.jar ]]; then
        SPARK_CLASSPATH=${SPARK_CLASSPATH}:$i
      fi
   done