diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-25 10:15:15 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-26 11:30:35 +0200 |
| commit | f4a4ba9ac1b58b4726825400e1edd1bf47d4080a (patch) | |
| tree | bac77ca71f40262110433cb4e53fbcb5dc54a42c /desktop/scripts | |
| parent | 4972652eeba3ffa4d5055493d9275cfdc27b247c (diff) | |
Clean up option processing
* Support --version on non-UNX, too.
* Consistently show the first unknown option and the help blob in the presence
of any unknown options.
* There is no need to tunnel --help/--version past oosplash in the soffice
script, as oosplash is prepared to treat them adequately (esp. not pass them
over any pipe); this only added unnecessary variance to what spellings exactly
are supported and how mixtures of --help, --version, and unknown options are
handled.
Change-Id: I617f2e727e2f0eafd34a2de3b85d441c6783ec4f
Diffstat (limited to 'desktop/scripts')
| -rwxr-xr-x | desktop/scripts/soffice.sh | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index a259bf69c854..7727206c2a2b 100755 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -158,21 +158,5 @@ if [ -n "$VALGRINDCHECK" -a -z "$VALGRIND" ] ; then exec &>valgrind.log fi -# do not pass the request for command line help to oosplash -for arg in $@ ; do - case "$arg" in - -h | --h | --he | --hel | --help) - "$sd_prog/soffice.bin" --help - exit 0 - ;; - -V | --v | --ve | --ver | --vers | --versi | --versio | --version) - "$sd_prog/soffice.bin" --version - exit 0 - ;; - *) - ;; - esac -done - # oosplash does the rest: forcing pages in, javaldx etc. are exec $VALGRINDCHECK $STRACECHECK "$sd_prog/oosplash" "$@" |