X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=doc%2Fexamples%2Fjava-log4j%2Frun;h=f03271a9afc0016ed7f30d69866eff7721322fe0;hb=53f7d0d7404de911dd62dff06f08539e33ea7519;hp=91f8f5d6b74300996b999f216e31fb2f2c935077;hpb=cd9116e546266e810595c95b7916f115c82ac161;p=lttng-ust.git

diff --git a/doc/examples/java-log4j/run b/doc/examples/java-log4j/run
index 91f8f5d6..f03271a9 100755
--- a/doc/examples/java-log4j/run
+++ b/doc/examples/java-log4j/run
@@ -1,13 +1,18 @@
 #!/bin/bash
 
+# SPDX-FileCopyrightText: 2023 EfficiOS, Inc
+#
+# SPDX-License-Identifier: MIT
+
 #
 # The -cp path should be changed to the lttng ust agent jar file on your system
 # or locally to the project. Same goes for the Java library path in order to
 # find the JNI Log4j library.
 #
 
-DIR=`dirname $0`
-JARFILE="liblttng-ust-agent.jar"
+DIR=$(dirname "$0")
+JARFILE_COMMON="lttng-ust-agent-common.jar"
+JARFILE_LOG4J="lttng-ust-agent-log4j.jar"
 JAVA_OPTIONS=""
 
 # If system classpath is empty, try to guess log4j location
@@ -15,21 +20,21 @@ 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="../../../liblttng-ust-java-agent/java/$JARFILE:$CLASSPATH"
-	LIBPATH="../../../liblttng-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="/usr/local/share/java/$JARFILE:/usr/share/java/$JARFILE:$CLASSPATH"
+	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"
 	# Use system defined java.library.path
 	#LIBPATH="/usr/local/lib:/usr/lib"
 fi
 
 if [ "x$LIBPATH" != "x" ]; then
-	JAVA_OPTIONS="$JAVA_OPTIONS -Djava.library.path=\"$LIBPATH\""
+	JAVA_OPTIONS="$JAVA_OPTIONS -Djava.library.path=$LIBPATH"
 fi
 
-java -classpath "$CLASSPATH:." $JAVA_OPTIONS Hello
-
-cd -
+java -classpath "$CLASSPATH:." $JAVA_OPTIONS HelloLog4j