diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-11-11 11:28:45 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-11-11 11:28:45 +0000 |
| commit | c78a5da7c41d2220507b2fac5d7d1f889e97b839 (patch) | |
| tree | 41dc80af5bb40735616f9abd0aa643c497358331 /desktop/scripts | |
| parent | ef49c27b33b75fe9e03f58857f98ad90a145aff8 (diff) | |
INTEGRATION: CWS c06 (1.17.50); FILE MERGED
2005/09/22 07:56:01 kso 1.17.50.2: #i53834# - bootsrap params must too be passed to office on restart after crash.
2005/08/26 15:31:11 kso 1.17.50.1: #i53834# - pass bootstrap vars to javaldx.
Diffstat (limited to 'desktop/scripts')
| -rw-r--r-- | desktop/scripts/soffice.sh | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index cca30bf51463..8673557bb1a3 100644 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -5,9 +5,9 @@ # # $RCSfile: soffice.sh,v $ # -# $Revision: 1.18 $ +# $Revision: 1.19 $ # -# last change: $Author: rt $ $Date: 2005-09-08 17:02:48 $ +# last change: $Author: rt $ $Date: 2005-11-11 12:28:45 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -147,9 +147,18 @@ case $sd_platform in ;; esac +#collect all bootstrap variables specified on the command line +#so that they can be passed as arguments to javaldx later on +for arg in $@ +do + case "$arg" in + -env:*) BOOTSTRAPVARS=$BOOTSTRAPVARS" ""$arg";; + esac +done + # extend the ld_library_path for java: javaldx checks the sofficerc for us if [ -x "$sd_prog/javaldx" ] ; then - java_ld_library_path=`"$sd_prog/javaldx"` + java_ld_library_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS` if [ "$java_ld_library_path" != "" ] ; then case $sd_platform in AIX) @@ -225,7 +234,7 @@ export PATH while [ $? -eq 79 ] do - "$sd_prog/$sd_binary" + "$sd_prog/$sd_binary" ""$BOOTSTRAPVARS"" done exit |