From 2a835ac857b4f46e28006421757e4978da74885a Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Fri, 11 Nov 2005 11:29:10 +0000
Subject: INTEGRATION: CWS c06 (1.2.300); FILE MERGED 2005/08/26 15:31:12 kso
 1.2.300.1: #i53834# - pass bootstrap vars to javaldx.

---
 desktop/scripts/unopkg.sh | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'desktop/scripts')

diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
index 25219d6e460d..88bf3a7d6a6e 100644
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.sh
@@ -5,9 +5,9 @@
 #
 #   $RCSfile: unopkg.sh,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: rt $ $Date: 2005-09-08 17:03:21 $
+#   last change: $Author: rt $ $Date: 2005-11-11 12:29:10 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -95,9 +95,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)
-- 
cgit