c5c56a6
From 4ee0775161d44acc5089aeec2013d461fe592e23 Mon Sep 17 00:00:00 2001
a85919d
From: David Tardon <dtardon@redhat.com>
a85919d
Date: Mon, 3 Feb 2014 20:24:50 +0100
a85919d
Subject: [PATCH] i#86080 unopkg bodge
a85919d
a85919d
---
c5c56a6
 desktop/scripts/unopkg.sh | 53 +++++++++++++++++++++++++++++++++++++++++++++--
c5c56a6
 1 file changed, 51 insertions(+), 2 deletions(-)
a85919d
a85919d
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
c5c56a6
index ca1e3bc..6393e99 100755
a85919d
--- a/desktop/scripts/unopkg.sh
a85919d
+++ b/desktop/scripts/unopkg.sh
c5c56a6
@@ -78,6 +78,53 @@ if [ "$(id -u)" -eq "0" ]; then
c5c56a6
     fi
c5c56a6
 fi
8076325
 
c5c56a6
+if [ $isnotuser -eq 1 ]; then
c5c56a6
+    echo $@ | grep -q env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY
c5c56a6
+    if [ $? -ne 0 ]; then
c5c56a6
+        set -- $@ '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
c5c56a6
+    fi
c5c56a6
+    echo $@ | grep -q env:UNO_JAVA_JFW_INSTALL_DATA
c5c56a6
+    if [ $? -ne 0 -a -w $sd_prog/../share/config/javasettingsunopkginstall.xml ]; then
c5c56a6
+        set -- $@ '-env:UNO_JAVA_JFW_INSTALL_DATA=$$ORIGIN/../share/config/javasettingsunopkginstall.xml'
c5c56a6
+    fi
c5c56a6
+    echo $@ | grep -q env:UserInstallation
c5c56a6
+    if [ $? -ne 0 ]; then
c5c56a6
+        INSTDIR=`/bin/mktemp -d --tmpdir unoinstall.XXXXXX`
c5c56a6
+        if [ $? -ne 0 ]; then
c5c56a6
+            echo "Could not create tmp dir" >&2
c5c56a6
+            exit 1
c5c56a6
+        fi
c5c56a6
+        set -- $@ '-env:UserInstallation=file://'$INSTDIR
c5c56a6
+    fi
c5c56a6
+fi
c5c56a6
+
93fc449
+isnotuser=0
8076325
+for arg in $@
8076325
+do
4fd0213
+if [ "$arg" = "--shared" -o "$arg" = "--bundled" ]; then
93fc449
+    isnotuser=1
8076325
+fi
8076325
+done
93fc449
+if [ $isnotuser -eq 1 ]; then
8076325
+    echo $@ | grep -q env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY
8076325
+    if [ $? -ne 0 ]; then
8076325
+        set -- $@ '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
8076325
+    fi
8076325
+    echo $@ | grep -q env:UNO_JAVA_JFW_INSTALL_DATA
8076325
+    if [ $? -ne 0 -a -w $sd_prog/../share/config/javasettingsunopkginstall.xml ]; then
8076325
+        set -- $@ '-env:UNO_JAVA_JFW_INSTALL_DATA=$$ORIGIN/../share/config/javasettingsunopkginstall.xml'
8076325
+    fi
8076325
+    echo $@ | grep -q env:UserInstallation
8076325
+    if [ $? -ne 0 ]; then
8076325
+        INSTDIR=`/bin/mktemp -d --tmpdir unoinstall.XXXXXX`
8076325
+        if [ $? -ne 0 ]; then
8076325
+            echo "Could not create tmp dir" >&2
8076325
+            exit 1
8076325
+        fi
8076325
+        set -- $@ '-env:UserInstallation=file://'$INSTDIR
8076325
+    fi
8076325
+fi
8076325
+
c5c56a6
 # extend the ld_library_path for java: javaldx checks the sofficerc for us
c5c56a6
 if [ -x "${sd_prog}/javaldx" ] ; then
c5c56a6
     my_path=`"${sd_prog}/javaldx" $BOOTSTRAPVARS \
c5c56a6
@@ -106,6 +153,8 @@ unset XENVIRONMENT
8076325
 # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
8076325
 
8076325
 # execute binary
e3b84da
-exec "$sd_prog/unopkg.bin" "$@" \
e3b84da
+"$sd_prog/unopkg.bin" "$@" \
8076325
     "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"
8076325
-
8076325
+if [ -n "$INSTDIR" ]; then
8076325
+   rm -rf $INSTDIR
8076325
+fi
a85919d
-- 
c5c56a6
2.4.2
a85919d