X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=doc%2Fexamples%2Fjava-log4j%2Frun;h=f03271a9afc0016ed7f30d69866eff7721322fe0;hb=53f7d0d7404de911dd62dff06f08539e33ea7519;hp=d6e5afa4be7dcb8c16fc71c1b43337c218a3e705;hpb=3081c83f06d9a65cae1507a5db358df84ed7c192;p=lttng-ust.git diff --git a/doc/examples/java-log4j/run b/doc/examples/java-log4j/run index d6e5afa4..f03271a9 100755 --- a/doc/examples/java-log4j/run +++ b/doc/examples/java-log4j/run @@ -1,4 +1,6 @@ #!/bin/bash + +# SPDX-FileCopyrightText: 2023 EfficiOS, Inc # # SPDX-License-Identifier: MIT @@ -8,7 +10,7 @@ # find the JNI Log4j library. # -DIR=`dirname $0` +DIR=$(dirname "$0") JARFILE_COMMON="lttng-ust-agent-common.jar" JARFILE_LOG4J="lttng-ust-agent-log4j.jar" JAVA_OPTIONS="" @@ -18,12 +20,12 @@ if [ "x$CLASSPATH" = "x" ]; then CLASSPATH="/usr/local/share/java/log4j.jar:/usr/share/java/log4j.jar" fi -cd $DIR +cd "$DIR" || exit 1 if [ -f "$DIR/.intree" ]; then - CLASSPATH="$CLASSPATH:../../../lib/lttng-ust-java-agent/java/lttng-ust-agent-common/$JARFILE_COMMON" - CLASSPATH="$CLASSPATH:../../../lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/$JARFILE_LOG4J" - LIBPATH="../../../lib/lttng-ust-java-agent/jni/log4j/.libs" + CLASSPATH="$CLASSPATH:../../../src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/$JARFILE_COMMON" + CLASSPATH="$CLASSPATH:../../../src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/$JARFILE_LOG4J" + LIBPATH="../../../src/lib/lttng-ust-java-agent/jni/log4j/.libs" else CLASSPATH="$CLASSPATH:/usr/local/share/java/$JARFILE_COMMON:/usr/share/java/$JARFILE_COMMON" CLASSPATH="$CLASSPATH:/usr/local/share/java/$JARFILE_LOG4J:/usr/share/java/$JARFILE_LOG4J" @@ -35,6 +37,4 @@ if [ "x$LIBPATH" != "x" ]; then JAVA_OPTIONS="$JAVA_OPTIONS -Djava.library.path=$LIBPATH" fi -java -classpath "$CLASSPATH:." $JAVA_OPTIONS Hello - -cd - +java -classpath "$CLASSPATH:." $JAVA_OPTIONS HelloLog4j