Update jitsi.sh

3 files changed, 18 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 11e37cc7af74..904d62f4ed9a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Feb 28 05:39:37 UTC 2017
+# Fri Mar  3 07:20:03 UTC 2017
 pkgbase = jitsi
 	pkgdesc = An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)
 	pkgver = 2.10.5550
-	pkgrel = 2
+	pkgrel = 3
 	url = http://jitsi.org
 	arch = i686
 	arch = x86_64
@@ -21,7 +21,7 @@ pkgbase = jitsi
 	source = jitsi.sh
 	sha256sums = cdfc6f038d1b877c42d26dba1864ac7c6b554dd55c18767a29f2db3618647287
 	sha256sums = 61e3bec3470790fa067f87d978016ec4452a6fd3dfba2c9afa5245b58d3cb19d
-	sha256sums = 529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5
+	sha256sums = 798e2559c74536d947f5c793c6e74400a453623ee1d3e15aaf0f2601f0892705
 
 pkgname = jitsi
 
diff --git a/PKGBUILD b/PKGBUILD
index bf4fc7334c99..37bdd6dd83f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=jitsi
 pkgver=2.10.5550
-pkgrel=2
+pkgrel=3
 pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)"
 arch=('i686' 'x86_64')
 url="http://jitsi.org"
@@ -16,7 +16,7 @@ source=("https://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip"
 		jitsi.sh)
 sha256sums=('cdfc6f038d1b877c42d26dba1864ac7c6b554dd55c18767a29f2db3618647287'
             '61e3bec3470790fa067f87d978016ec4452a6fd3dfba2c9afa5245b58d3cb19d'
-            '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5')
+            '798e2559c74536d947f5c793c6e74400a453623ee1d3e15aaf0f2601f0892705')
 
 build()
 {
diff --git a/jitsi.sh b/jitsi.sh
index 6e53cdbf569d..5826bd48fe67 100644
--- a/jitsi.sh
+++ b/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[@]}" "$@"