diff options
| author | Michal Svec <msvec@novell.com> | 2011-07-12 14:16:42 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-07-12 14:16:42 +0200 |
| commit | 0712e5233c1e6c452f5c888351870047673f0da6 (patch) | |
| tree | de4a7a6c39666ee2554ec71ed432e798dbbb589e /desktop | |
| parent | b6b31361740629be2c65cbe028d9dd31f6af46d7 (diff) | |
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
Diffstat (limited to 'desktop')
| -rwxr-xr-x | desktop/scripts/soffice.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index a97f68d80808..b23d4522b4fa 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" "$@" |