# 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=""
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"
JAVA_OPTIONS="$JAVA_OPTIONS -Djava.library.path=$LIBPATH"
fi
-java -classpath "$CLASSPATH:." $JAVA_OPTIONS Hello
-
-cd -
+java -classpath "$CLASSPATH:." $JAVA_OPTIONS HelloLog4j