summaryrefslogtreecommitdiff
path: root/nonprism/jitsi/jitsi.sh
diff options
context:
space:
mode:
Diffstat (limited to 'nonprism/jitsi/jitsi.sh')
-rw-r--r--nonprism/jitsi/jitsi.sh22
1 files changed, 14 insertions, 8 deletions
diff --git a/nonprism/jitsi/jitsi.sh b/nonprism/jitsi/jitsi.sh
index 6e53cdbf5..ae544f39f 100644
--- a/nonprism/jitsi/jitsi.sh
+++ b/nonprism/jitsi/jitsi.sh
@@ -3,15 +3,21 @@
CLIENTARGS=""
uname -m | grep i686 && CLIENTARGS="-client -Xmx256m"
+if [[ -n ${JAVA_HOME} ]]; then
+ JAVABIN="${JAVA_HOME}/bin/java"
+else
+ JAVABIN="java"
+fi
+
SCDIR=/usr/lib/jitsi
-LIBPATH="$SCDIR/lib"
-CLASSPATH="$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$LIBPATH/bcprovider.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar"
-FELIX_CONFIG="$LIBPATH/felix.client.run.properties"
-LOG_CONFIG="$LIBPATH/logging.properties"
-COMMAND=("$JAVA_HOME/bin/java" $CLIENTARGS -classpath "$CLASSPATH" -Djna.library.path="$LIBPATH/native" -Dfelix.config.properties="file:$FELIX_CONFIG" -Djava.util.logging.config.file="$LOG_CONFIG" net.java.sip.communicator.launcher.SIPCommunicator)
+LIBPATH="${SCDIR}/lib"
+CLASSPATH="${LIBPATH}/felix.jar:${SCDIR}/sc-bundles/sc-launcher.jar:${SCDIR}/sc-bundles/util.jar:${SCDIR}/sc-bundles/dnsjava.jar:${LIBPATH}"
+FELIX_CONFIG="${LIBPATH}/felix.client.run.properties"
+LOG_CONFIG="${LIBPATH}/logging.properties"
+COMMAND="${JAVABIN} ${CLIENTARGS} -classpath ${CLASSPATH} -Djna.library.path=${LIBPATH}/native -Dfelix.config.properties=file:${FELIX_CONFIG} -Djava.util.logging.config.file=${LOG_CONFIG} net.java.sip.communicator.launcher.SIPCommunicator"
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIBPATH/native"
+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${LIBPATH}/native"
-cd "$SCDIR"
+cd "${SCDIR}"
-exec "${COMMAND[@]}" "$@"
+exec ${COMMAND} $*