aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2013-07-10 11:33:26 +0300
committerDamian Minkov <damencho@jitsi.org>2013-07-10 11:34:30 +0300
commitdeb1fa70ea76e144de768a72f6ea97084c585153 (patch)
tree41c94986494d4eae3f765cacf66aac78e5691019
parent5a9682077bcc651362b7d58951dfc502d8090110 (diff)
downloadjitsi-deb1fa70ea76e144de768a72f6ea97084c585153.zip
jitsi-deb1fa70ea76e144de768a72f6ea97084c585153.tar.gz
jitsi-deb1fa70ea76e144de768a72f6ea97084c585153.tar.bz2
Fixes lib folder to be in classpath for linux based distributions.
-rw-r--r--resources/install/debian/jitsi.sh.tmpl2
-rw-r--r--resources/install/generic/run.sh2
-rwxr-xr-xresources/install/linux/run.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/resources/install/debian/jitsi.sh.tmpl b/resources/install/debian/jitsi.sh.tmpl
index 5c203bd..eefa68d 100644
--- a/resources/install/debian/jitsi.sh.tmpl
+++ b/resources/install/debian/jitsi.sh.tmpl
@@ -15,7 +15,7 @@ javabin=`which java`
SCDIR=/usr/share/_PACKAGE_NAME_
LIBPATH=$SCDIR/lib
-CLASSPATH=/usr/share/java/org.apache.felix.framework.jar:/usr/share/java/org.apache.felix.main.jar:$LIBPATH/bcprovider.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar/launchutils.jar:$SCDIR
+CLASSPATH=/usr/share/java/org.apache.felix.framework.jar:/usr/share/java/org.apache.felix.main.jar:$LIBPATH/bcprovider.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar/launchutils.jar:$LIBPATH
FELIX_CONFIG=$LIBPATH/felix.client.run.properties
LOG_CONFIG=$LIBPATH/logging.properties
COMMAND="$javabin $CLIENTARGS -classpath $CLASSPATH -Djna.library.path=/usr/lib/jni -Dfelix.config.properties=file:$FELIX_CONFIG -Djava.util.logging.config.file=$LOG_CONFIG net.java.sip.communicator.launcher.SIPCommunicator"
diff --git a/resources/install/generic/run.sh b/resources/install/generic/run.sh
index 8f3e6f5..46b2d9b 100644
--- a/resources/install/generic/run.sh
+++ b/resources/install/generic/run.sh
@@ -12,4 +12,4 @@ then
fi
export PATH=$PATH:native
-java $CLIENTARGS -classpath "lib/felix.jar:lib/bcprovider.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator
+java $CLIENTARGS -classpath "lib/felix.jar:lib/bcprovider.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator
diff --git a/resources/install/linux/run.sh b/resources/install/linux/run.sh
index 9644dcb..cfe975b 100755
--- a/resources/install/linux/run.sh
+++ b/resources/install/linux/run.sh
@@ -2,4 +2,4 @@ mkdir -p $HOME/.sip-communicator/log
export PATH=$PATH:native
export JAVA_HOME=jre
-${JAVA_HOME}/bin/java -classpath "lib/bcprovider.jar:lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar" -Djna.library.path=native -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator
+${JAVA_HOME}/bin/java -classpath "lib/bcprovider.jar:lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djna.library.path=native -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator