diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-07 21:12:30 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-07 22:06:28 +0200 |
| commit | 2ff63bcdeac45ca10a6c6ac72ac8c9faf9301aa2 (patch) | |
| tree | 1119c8730bd6628f10923dc3357ecae7d71bad28 /setup_native/source | |
| parent | 29e11dd13efc2d1325b0f424788484bc8ecf0ce1 (diff) | |
Undo basis/brand split: merge basis share/ into brand share/.
Diffstat (limited to 'setup_native/source')
| -rw-r--r-- | setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions b/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions index 696277011133..c4ce0df3b5b8 100644 --- a/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions +++ b/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions @@ -29,8 +29,6 @@ #Create the folder which contains the temporary user installation INSTDIR=`/usr/bin/mktemp -d "/tmp/userinstall.XXXXXX"` -OOO_BASE_DIR="/opt/openoffice.org/basis${OOOBASEVERSION}" - case "$1" in 'start') EXTENSIONDIR=/opt/openoffice.org${OOOBRANDPACKAGEVERSION}/share/extension/install @@ -50,7 +48,7 @@ case "$1" in #list. That is, it has not been installed (with unopkg) yet. #Therefore we do it now. echo installing $FILE - /opt/openoffice.org${OOOBRANDPACKAGEVERSION}/program/unopkg add --shared --bundled "$FILE" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + /opt/openoffice.org${OOOBRANDPACKAGEVERSION}/program/unopkg add --shared --bundled "$FILE" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=/opt/openoffice.org/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' #Let us remember that this extensions has been installed #by adding the path name of the extension to the file #installed @@ -78,7 +76,7 @@ case "$1" in # #share/extension/install. Now we remove the installed # #extension # echo removing `basename $LINE` -# /opt/openoffice.org${OOOBRANDPACKAGEVERSION}/program/unopkg remove --shared --bundled "`basename $LINE`" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' +# /opt/openoffice.org${OOOBRANDPACKAGEVERSION}/program/unopkg remove --shared --bundled "`basename $LINE`" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=/opt/openoffice.org/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' # REMOVED=1 # else # NEWCONTENT+=$LINE |