diff options
| author |   Jim Ramsay <lack@gentoo.org> | 2007-12-07 15:40:34 +0000 |
|---|---|---|
| committer | Jim Ramsay <lack@gentoo.org> | 2007-12-07 15:40:34 +0000 |
| commit | 20e1b292310c1f3e8f0aed94f7e15e7aebad7064 (patch) | |
| tree | 53b2375bfb08a596f95008804747a65e4633893c /eclass | |
| parent | Add ~alpha wrt #201354 (diff) | |
| download | gentoo-2-20e1b292310c1f3e8f0aed94f7e15e7aebad7064.tar.gz gentoo-2-20e1b292310c1f3e8f0aed94f7e15e7aebad7064.tar.bz2 gentoo-2-20e1b292310c1f3e8f0aed94f7e15e7aebad7064.zip | |
Fixed icon parsing to remove icon type suffix from .desktop file
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/rox.eclass | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/eclass/rox.eclass b/eclass/rox.eclass index 5012f827d687..90e81a0ae69e 100644 --- a/eclass/rox.eclass +++ b/eclass/rox.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/rox.eclass,v 1.25 2007/12/04 02:37:29 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/rox.eclass,v 1.26 2007/12/07 15:40:34 lack Exp $ # ROX eclass Version 3 @@ -198,25 +198,26 @@ rox_install_desktop() { # Copy the .DirIcon into /usr/share/pixmaps with the proper extension if [[ -f "${APPNAME}/.DirIcon" ]]; then local APPDIRICON=${APPNAME}/.DirIcon + local APPICON case "$(file -b ${APPDIRICON})" in "PNG image data"*) - export APPICON=${WRAPPERNAME}.png + APPICON=${WRAPPERNAME}.png ;; "XML 1.0 document text"*) - export APPICON=${WRAPPERNAME}.svg + APPICON=${WRAPPERNAME}.svg ;; "X pixmap image text"*) - export APPICON=${WRAPPERNAME}.xpm + APPICON=${WRAPPERNAME}.xpm ;; "symbolic link"*) APPDIRICON=$(dirname ${APPDIRICON})/$(readlink ${APPDIRICON}) - export APPICON=${WRAPPERNAME}.${APPDIRICON##*.} + APPICON=${WRAPPERNAME}.${APPDIRICON##*.} ;; *) # Unknown... Remark on it, and just copy without an extension ewarn "Could not detect the file type of the application icon," ewarn "copying without an extension." - export APPICON=${WRAPPERNAME} + APPICON=${WRAPPERNAME} ;; esac # Subshell, so as to not pollute the caller's env. @@ -226,7 +227,7 @@ rox_install_desktop() { ) fi - rox_desktop_entry "${WRAPPERNAME}" "${APPNAME}" "${APPICON}" \ + rox_desktop_entry "${WRAPPERNAME}" "${APPNAME}" "${WRAPPERNAME}" \ "${APPCATEGORY}" "MimeType=$(expandmime $APPMIME)" fi } |