diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-12-05 19:32:00 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-12-05 21:08:00 +0100 |
| commit | 8412548e734ddf699ddbffba0cf7edeb2548c86c (patch) | |
| tree | d43b7a9180796c627603bb2b26f4aa0c661897c7 /sysui/desktop/share/create_tree.sh | |
| parent | bee2841519d15d8df1520ef3052e3a8da19eac1b (diff) | |
allow to install desktop integration in Linux dev build
The desktop integration searched for the package name by the dash "-"
delimiter on many locations. It was not easy to add support for
package names with the dash.
In addition, there was an inconsistence. Most package names used the
"libo-dev" prefix name but the ure packages used "lodev". It was
installed into the prefix /opt/lo-dev.
So, I remaned everything to "lodev". It removed the inconsistence
and solved solution with the dash.
Diffstat (limited to 'sysui/desktop/share/create_tree.sh')
| -rwxr-xr-x | sysui/desktop/share/create_tree.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh index 141e9a10d4ea..2df81132a71a 100755 --- a/sysui/desktop/share/create_tree.sh +++ b/sysui/desktop/share/create_tree.sh @@ -53,7 +53,7 @@ ln -sf "${office_root}/program/soffice" "${DESTDIR}/usr/bin/${PREFIX}" cp printeradmin.sh "${DESTDIR}/usr/bin/${PREFIX}-printeradmin" chmod 0755 "${DESTDIR}/usr/bin/${PREFIX}-printeradmin" -if test "${PREFIX}" != libreoffice${PRODUCTVERSION} ; then +if test "${PREFIX}" != libreoffice${PRODUCTVERSION} -a "${PREFIX}" != lodev${PRODUCTVERSION} ; then # compat symlinks mkdir -p "${DESTDIR}${office_prefix}" ln -sf libreoffice${PRODUCTVERSION} "${DESTDIR}${office_root}" @@ -61,9 +61,10 @@ if test "${PREFIX}" != libreoffice${PRODUCTVERSION} ; then ln -sf /usr/bin/${PREFIX}-printeradmin "${DESTDIR}/usr/bin/libreoffice${PRODUCTVERSION}-printeradmin" fi +test "${PREFIX}" = lodev${PRODUCTVERSION} && mime_def_file="lodev${PRODUCTVERSION}.xml" || mime_def_file="libreoffice${PRODUCTVERSION}.xml" mkdir -p "${DESTDIR}/usr/share/mime/packages" -cp openoffice.org.xml "${DESTDIR}/usr/share/mime/packages/libreoffice${PRODUCTVERSION}.xml" -chmod 0644 "${DESTDIR}/usr/share/mime/packages/libreoffice${PRODUCTVERSION}.xml" +cp openoffice.org.xml "${DESTDIR}/usr/share/mime/packages/$mime_def_file" +chmod 0644 "${DESTDIR}/usr/share/mime/packages/$mime_def_file" mkdir -p "${DESTDIR}/usr/share/applications" for i in `cat launcherlist`; do |