View | Details | Raw Unified | Return to issue 86080
Collapse All | Expand All

(-)openoffice.org.orig/desktop/scripts/unopkg.sh (-1 / +27 lines)
Lines 95-100 Link Here
95
    ;;
95
    ;;
96
esac
96
esac
97
97
98
isshared=0
99
for arg in $@
100
do
101
if [ "$arg" == "--shared" ]; then 
102
    isshared=1
103
fi
104
done
105
if [ $isshared -eq 1 ]; then
106
    echo $@ | grep -q env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY
107
    if [ $? -ne 0 ]; then
108
        set -- $@ '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
109
    fi
110
    echo $@ | grep -q env:UNO_JAVA_JFW_INSTALL_DATA
111
    if [ $? -ne 0 ]; then
112
        set -- $@ '-env:UNO_JAVA_JFW_INSTALL_DATA=$$ORIGIN/../share/config/javasettingsunopkginstall.xml'
113
    fi
114
    echo $@ | grep -q env:UserInstallation
115
    if [ $? -ne 0 ]; then
116
        INSTDIR=`/bin/mktemp -d --tmpdir unoinstall.XXXXXX`
117
        set -- $@ '-env:UserInstallation=file://'$INSTDIR
118
    fi
119
fi
120
98
#collect all bootstrap variables specified on the command line
121
#collect all bootstrap variables specified on the command line
99
#so that they can be passed as arguments to javaldx later on
122
#so that they can be passed as arguments to javaldx later on
100
for arg in $@
123
for arg in $@
Lines 149-153 Link Here
149
[ $# -eq 1 -a "oxt" = "`echo $1 | cut -d . -f 2`" -a -n "$DISPLAY" ] && GUI="gui"
172
[ $# -eq 1 -a "oxt" = "`echo $1 | cut -d . -f 2`" -a -n "$DISPLAY" ] && GUI="gui"
150
173
151
# execute binary
174
# execute binary
152
exec "$sd_prog/$sd_binary" $GUI "$@"
175
"$sd_prog/$sd_binary" $GUI "$@"
153
176
177
if [ -n "$INSTDIR" ]; then
178
   rm -rf $INSTDIR
179
fi

Return to issue 86080