[Libreoffice-commits] .: desktop/scripts

[Jan Holesovsky]

 desktop/scripts/soffice.sh |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

New commits:
commit 43a1c20772cae3ac0109f2290ae394d9a59c5a30
Author: Michal Svec <msvec at novell.com>
Date:   Tue Jul 12 14:16:42 2011 +0200

    Do not pass the request for command line help to oosplash
    
    - both of these work now: 'libreoffice -h' and 'libreoffice --help'
    - added two more options: 'libreoffice -V' and 'libreoffice --version'
    - all of these options work even if there are instances running
    - there's no 1s delay between startup and actual output

diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 3e0219b..0543346 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -165,5 +165,21 @@ if [ -n "$VALGRINDCHECK" ] ; then
     exec &>valgrind.log
 fi
 
+# do not pass the request for command line help to oosplash
+if test "$#" -eq 1; then
+    case "$1" in
+        -h | --h | --he | --hel | --help)
+            "$sd_prog/soffice.bin" -h
+            exit 0
+            ;;
+        -V | --v | --ve | --ver | --vers | --versi | --versio | --version)
+            "$sd_prog/soffice.bin" -h | head -1
+            exit 0
+            ;;
+        *)
+            ;;
+    esac
+fi
+
 # oosplash does the rest: forcing pages in, javaldx etc. are
 exec $VALGRINDCHECK $STRACECHECK "$sd_prog/oosplash.bin" "$@"