[Libreoffice-commits] .: desktop/scripts

Caolán McNamara caolan at kemper.freedesktop.org
Wed Feb 29 03:12:47 PST 2012


 desktop/scripts/soffice.sh |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 3f9f18c53d9876106b274769dec9d0e3916feb8f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 29 11:10:31 2012 +0000

    Resolves: rhbz#788045 swriter --help etc doesn't show help
    
    because the test in soffice to skip oosplash is for only
    one argument, and swriter points to soffice with an additional
    --writer argument, so the test is skipped

diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 4d14051..2d42613 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -158,8 +158,8 @@ if [ -n "$VALGRINDCHECK" -a -z "$VALGRIND" ] ; then
 fi
 
 # do not pass the request for command line help to oosplash
-if test "$#" -eq 1; then
-    case "$1" in
+for arg in $@ ; do
+    case "$arg" in
         -h | --h | --he | --hel | --help)
             "$sd_prog/soffice.bin" --help
             exit 0
@@ -171,7 +171,7 @@ if test "$#" -eq 1; then
         *)
             ;;
     esac
-fi
+done
 
 # oosplash does the rest: forcing pages in, javaldx etc. are
 exec $VALGRINDCHECK $STRACECHECK "$sd_prog/oosplash" "$@"


More information about the Libreoffice-commits mailing list