From c05f5e672cd017a8f96b067ec97b52516a2df0ea Mon Sep 17 00:00:00 2001 From: Damian Minkov Date: Fri, 17 Jan 2014 13:57:35 +0200 Subject: [PATCH] Adds option to disable splash screen on linux. --- resources/install/debian/jitsi.sh.tmpl | 16 +++++++++++++++- .../util/launchutils/LaunchArgHandler.java | 5 +++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/resources/install/debian/jitsi.sh.tmpl b/resources/install/debian/jitsi.sh.tmpl index f5194a863..877b32b6d 100644 --- a/resources/install/debian/jitsi.sh.tmpl +++ b/resources/install/debian/jitsi.sh.tmpl @@ -11,6 +11,20 @@ then CLIENTARGS="-client -Xmx256m" fi +show_splash=true +for arg in "$@" ; do + if [ "$arg" = "--splash=no" ] ; then + show_splash=false + elif [ "$arg" = "--splash=yes" ] ; then + show_splash=true + fi +done + +SPLASH_ARG="" +if $show_splash ; then + SPLASH_ARG="-splash:splash.gif" +fi + javabin=`which java` SCDIR=/usr/share/_PACKAGE_NAME_ @@ -18,7 +32,7 @@ LIBPATH=$SCDIR/lib CLASSPATH=/usr/share/java/org.apache.felix.framework.jar:/usr/share/java/org.apache.felix.main.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 -splash:splash.gif net.java.sip.communicator.launcher.SIPCommunicator" +COMMAND="$javabin $CLIENTARGS -classpath $CLASSPATH -Djna.library.path=/usr/lib/jni -Dfelix.config.properties=file:$FELIX_CONFIG -Djava.util.logging.config.file=$LOG_CONFIG $SPLASH_ARG net.java.sip.communicator.launcher.SIPCommunicator" # set add LIBPATH to LD_LIBRARY_PATH for any sc natives (e.g. jmf .so's) export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}/usr/lib/jni" diff --git a/src/net/java/sip/communicator/util/launchutils/LaunchArgHandler.java b/src/net/java/sip/communicator/util/launchutils/LaunchArgHandler.java index a6de4cb85..ae630b052 100644 --- a/src/net/java/sip/communicator/util/launchutils/LaunchArgHandler.java +++ b/src/net/java/sip/communicator/util/launchutils/LaunchArgHandler.java @@ -283,6 +283,11 @@ else if (args[i].equals("--multiple") || args[i].equals("-m")) returnAction = ACTION_CONTINUE_LOCK_DISABLED; continue; } + else if (args[i].startsWith("--splash=")) + { + // do nothing already handled by startup script/binary + continue; + } //if this is the last arg and it's not an option then it's probably //an URI else if ( i == args.length - 1