diff options
author | Jan Holesovsky <kendy@suse.cz> | 2010-10-12 15:32:09 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@novell.com> | 2010-10-12 15:40:42 +0100 |
commit | e9fe1e24fbe38a8056f0ed65a1f35f199a8a3869 (patch) | |
tree | 0c48f10dc073b739efde020c7f960b7c772f722d /desktop/scripts | |
parent | 20658054d8bd6380b4b175b552ccc1480c49d01c (diff) |
Implement unix quick-starter
Kendy's standalone unix-quick-starter, with tweaks to make it
conditionally compiled, and load png images with the new
branding layout from Michael.
Fixes to the soffice shell-script to not run pagein for a 2nd start
Diffstat (limited to 'desktop/scripts')
-rw-r--r-- | desktop/scripts/soffice.sh | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index 2c14f12a8e09..df11ec5c13e3 100644 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -71,6 +71,26 @@ do esac done +# test for availability of the fast external splash +for arg in $@; do + if [ "$arg" = "-nologo" -o "$arg" = "-no-oosplash" ]; then + no_oosplash=y + fi +done + +# Setup our app as oosplash, but try to avoid executing pagein, +# and other expensive environment setup pieces wherever possible +# for a second started office +if [ "$sd_binary" = "soffice.bin" -a -x "$sd_prog/oosplash.bin" ] && [ "$no_oosplash" != "y" ] ; then + sd_binary="oosplash.bin" + + export QSTART_CHECK_ONLY=1 + if "$sd_prog/$sd_binary" -qsend-and-report $*; then + exit 0 + fi + unset QSTART_CHECK_ONLY +fi + # pagein sd_pagein_args=@pagein-common for sd_arg in "$@"; do |