| 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 |
@@ -62,6 +62,33 @@ |
| 4 |
;; |
| 5 |
esac |
| 6 |
|
| 7 |
+isnotuser=0 |
| 8 |
+for arg in $@ |
| 9 |
+do |
| 10 |
+if [ "$arg" = "--shared" -o "$arg" = "--bundled" ]; then |
| 11 |
+ isnotuser=1 |
| 12 |
+fi |
| 13 |
+done |
| 14 |
+if [ $isnotuser -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 |
+ if [ $? -ne 0 ]; then |
| 27 |
+ echo "Could not create tmp dir" >&2 |
| 28 |
+ exit 1 |
| 29 |
+ fi |
| 30 |
+ set -- $@ '-env:UserInstallation=file://'$INSTDIR |
| 31 |
+ fi |
| 32 |
+fi |
| 33 |
+ |
| 34 |
#collect all bootstrap variables specified on the command line |
| 35 |
#so that they can be passed as arguments to javaldx later on |
| 36 |
for arg in $@ |
| 37 |
@@ -110,6 +137,8 @@ |
| 38 |
# SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS |
| 39 |
|
| 40 |
# execute binary |
| 41 |
-exec "$sd_prog/unopkg.bin" "$@" \ |
| 42 |
+"$sd_prog/unopkg.bin" "$@" \ |
| 43 |
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc" |
| 44 |
- |
| 45 |
+if [ -n "$INSTDIR" ]; then |
| 46 |
+ rm -rf $INSTDIR |
| 47 |
+fi |
Parent Directory
| 
Revision Log