| 1 |
--- openoffice.org.orig/desktop/scripts/unopkg.sh 2008-01-14 15:55:26.000000000 +0000
|
| 2 |
+++ openoffice.org/desktop/scripts/unopkg.sh 2008-02-14 10:52:10.000000000 +0000
|
| 3 |
@@ -47,6 +47,29 @@
|
| 4 |
sd_prog=`pwd`
|
| 5 |
cd "$sd_cwd"
|
| 6 |
|
| 7 |
+isshared=0
|
| 8 |
+for arg in $@
|
| 9 |
+do
|
| 10 |
+if [ "$arg" = "--shared" ]; then
|
| 11 |
+ isshared=1
|
| 12 |
+fi
|
| 13 |
+done
|
| 14 |
+if [ $isshared -eq 1 ]; then
|
| 15 |
+ echo $@ | grep -q env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY
|
| 16 |
+ if [ $? -ne 0 ]; then
|
| 17 |
+ set -- $@ '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
|
| 18 |
+ fi
|
| 19 |
+ echo $@ | grep -q env:UNO_JAVA_JFW_INSTALL_DATA
|
| 20 |
+ if [ $? -ne 0 -a -w $sd_prog/../share/config/javasettingsunopkginstall.xml ]; then
|
| 21 |
+ set -- $@ '-env:UNO_JAVA_JFW_INSTALL_DATA=$$ORIGIN/../share/config/javasettingsunopkginstall.xml'
|
| 22 |
+ fi
|
| 23 |
+ echo $@ | grep -q env:UserInstallation
|
| 24 |
+ if [ $? -ne 0 ]; then
|
| 25 |
+ INSTDIR=`/bin/mktemp -d --tmpdir unoinstall.XXXXXX`
|
| 26 |
+ set -- $@ '-env:UserInstallation=file://'$INSTDIR
|
| 27 |
+ fi
|
| 28 |
+fi
|
| 29 |
+
|
| 30 |
#collect all bootstrap variables specified on the command line
|
| 31 |
#so that they can be passed as arguments to javaldx later on
|
| 32 |
for arg in $@
|
| 33 |
@@ -76,6 +99,8 @@
|
| 34 |
export PATH
|
| 35 |
|
| 36 |
# execute binary
|
| 37 |
-exec "$sd_prog/unopkg.bin" "$@" \
|
| 38 |
+"$sd_prog/unopkg.bin" "$@" \
|
| 39 |
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"
|
| 40 |
-
|
| 41 |
+if [ -n "$INSTDIR" ]; then
|
| 42 |
+ rm -rf $INSTDIR
|
| 43 |
+fi
|
Parent Directory
| 
Revision Log