diff options
| author |   Carsten Lohrke <carlo@gentoo.org> | 2008-05-17 15:19:56 +0000 |
|---|---|---|
| committer | Carsten Lohrke <carlo@gentoo.org> | 2008-05-17 15:19:56 +0000 |
| commit | 582d6a8de87d561f0cc60a4b584ada148db47b7d (patch) | |
| tree | 61f7bd653ddd9b67b7e87ba1911b8404d5b9862b /eclass | |
| parent | There is a difference between RDEPEND unset and explicitly set empty - cf. bu... (diff) | |
| download | gentoo-2-582d6a8de87d561f0cc60a4b584ada148db47b7d.tar.gz gentoo-2-582d6a8de87d561f0cc60a4b584ada148db47b7d.tar.bz2 gentoo-2-582d6a8de87d561f0cc60a4b584ada148db47b7d.zip | |
Simplify postprocess_desktop_entries().
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde-functions.eclass | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass index 430b1969c099..7b0037f88983 100644 --- a/eclass/kde-functions.eclass +++ b/eclass/kde-functions.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.167 2008/05/17 15:16:10 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.168 2008/05/17 15:19:56 carlo Exp $ # @ECLASS: kde-functions.eclass # @MAINTAINER: @@ -917,20 +917,11 @@ postprocess_desktop_entries() { local desktop_entries="$(find "${D}${PREFIX}/share/applnk" -mindepth 2 -maxdepth 2 \ -name '*\.desktop' -not -path '*.hidden*' 2>/dev/null)" - local uninstall_file="[Desktop Entry] -Encoding=UTF-8 -Hidden=true" - if [[ -n ${desktop_entries} ]]; then for entry in ${desktop_entries} ; do - echo "${uninstall_file}" | diff -qs ${entry} - &> /dev/null - if [[ $? != 0 ]]; then - if [[ ! -f ${D}${PREFIX}/share/applications/kde/$(basename ${entry}) ]]; then - dodir "${PREFIX}"/share/applications/kde - mv ${entry} "${D}${PREFIX}"/share/applications/kde - else - ewarn "QA: $(basename ${entry}) already exists in ${PREFIX}/share/applications/kde." - fi + if ! [[ -f "${D}${PREFIX}"/share/applications/kde/${entry##*/} ]] ; then + dodir "${PREFIX}"/share/applications/kde + mv ${entry} "${D}${PREFIX}"/share/applications/kde fi done fi |