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