X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=doc%2Fexamples%2Fjava-log4j%2Frun;h=c153e7b848569dc713b53051ad93d7ecbfc59587;hb=464c475658ae29039b3b9e769b5b02195688a94a;hp=056ea67f3300a3178bfbd95cc15c9de4de40d9d6;hpb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;p=lttng-ust.git

diff --git a/doc/examples/java-log4j/run b/doc/examples/java-log4j/run
index 056ea67f..c153e7b8 100755
--- a/doc/examples/java-log4j/run
+++ b/doc/examples/java-log4j/run
@@ -8,7 +8,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 +18,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:../../../liblttng-ust-java-agent/java/lttng-ust-agent-common/$JARFILE_COMMON"
-	CLASSPATH="$CLASSPATH:../../../liblttng-ust-java-agent/java/lttng-ust-agent-log4j/$JARFILE_LOG4J"
-	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="$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 +35,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