diff options
| author | Joachim Lingner <jl@openoffice.org> | 2010-09-29 09:11:20 +0200 |
|---|---|---|
| committer | Joachim Lingner <jl@openoffice.org> | 2010-09-29 09:11:20 +0200 |
| commit | 985fde0fa91498cf165d482ed306740adfb9a5e8 (patch) | |
| tree | cb638db796394d97d89f85e1d5b02b90531cc4d6 /desktop/scripts | |
| parent | 74ba81951f2c6686b837a7aa409b14f3c7ef0480 (diff) | |
jl160 #i114794# registration data folder of bundled extensions in the user installation references PREREG registration data in brand/share/prereg/bundled folder
Diffstat (limited to 'desktop/scripts')
| -rw-r--r-- | desktop/scripts/unopkg.sh | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh index 0fe319735c06..76f7b3a84204 100644 --- a/desktop/scripts/unopkg.sh +++ b/desktop/scripts/unopkg.sh @@ -45,16 +45,27 @@ cd "$sd_cwd" #collect all bootstrap variables specified on the command line #so that they can be passed as arguments to javaldx later on +#Recognize the "sync" option. sync must be applied without any other +#options except bootstrap variables. for arg in $@ do case "$arg" in -env:*) BOOTSTRAPVARS=$BOOTSTRAPVARS" ""$arg";; + sync) OPTSYNC=true;; + *) OPTOTHER=true;; esac done +if [ -n $OPTSYNC ] && [ -z $OPTOTHER ] +then + JVMFWKPARAMS='-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml -env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' +else + echo "unopkg script: Check usage of sync command". +fi + # extend the ld_library_path for java: javaldx checks the sofficerc for us if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then - my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \ + my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS $JVMFWKPARAMS \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` if [ -n "$my_path" ] ; then LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH} @@ -71,6 +82,6 @@ unset XENVIRONMENT # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS # execute binary -exec "$sd_prog/unopkg.bin" "$@" \ +exec "$sd_prog/unopkg.bin" "$@" "$JVMFWKPARAMS" \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc" |