| 1 |
lack 07/12/07 15:40:34 |
| 2 |
|
| 3 |
Modified: rox.eclass |
| 4 |
Log: |
| 5 |
Fixed icon parsing to remove icon type suffix from .desktop file |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.26 eclass/rox.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/rox.eclass?rev=1.26&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/rox.eclass?rev=1.26&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/rox.eclass?r1=1.25&r2=1.26 |
| 13 |
|
| 14 |
Index: rox.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/rox.eclass,v |
| 17 |
retrieving revision 1.25 |
| 18 |
retrieving revision 1.26 |
| 19 |
diff -u -r1.25 -r1.26 |
| 20 |
--- rox.eclass 4 Dec 2007 02:37:29 -0000 1.25 |
| 21 |
+++ rox.eclass 7 Dec 2007 15:40:34 -0000 1.26 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2004 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/rox.eclass,v 1.25 2007/12/04 02:37:29 lack Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/rox.eclass,v 1.26 2007/12/07 15:40:34 lack Exp $ |
| 27 |
|
| 28 |
# ROX eclass Version 3 |
| 29 |
|
| 30 |
@@ -198,25 +198,26 @@ |
| 31 |
# Copy the .DirIcon into /usr/share/pixmaps with the proper extension |
| 32 |
if [[ -f "${APPNAME}/.DirIcon" ]]; then |
| 33 |
local APPDIRICON=${APPNAME}/.DirIcon |
| 34 |
+ local APPICON |
| 35 |
case "$(file -b ${APPDIRICON})" in |
| 36 |
"PNG image data"*) |
| 37 |
- export APPICON=${WRAPPERNAME}.png |
| 38 |
+ APPICON=${WRAPPERNAME}.png |
| 39 |
;; |
| 40 |
"XML 1.0 document text"*) |
| 41 |
- export APPICON=${WRAPPERNAME}.svg |
| 42 |
+ APPICON=${WRAPPERNAME}.svg |
| 43 |
;; |
| 44 |
"X pixmap image text"*) |
| 45 |
- export APPICON=${WRAPPERNAME}.xpm |
| 46 |
+ APPICON=${WRAPPERNAME}.xpm |
| 47 |
;; |
| 48 |
"symbolic link"*) |
| 49 |
APPDIRICON=$(dirname ${APPDIRICON})/$(readlink ${APPDIRICON}) |
| 50 |
- export APPICON=${WRAPPERNAME}.${APPDIRICON##*.} |
| 51 |
+ APPICON=${WRAPPERNAME}.${APPDIRICON##*.} |
| 52 |
;; |
| 53 |
*) |
| 54 |
# Unknown... Remark on it, and just copy without an extension |
| 55 |
ewarn "Could not detect the file type of the application icon," |
| 56 |
ewarn "copying without an extension." |
| 57 |
- export APPICON=${WRAPPERNAME} |
| 58 |
+ APPICON=${WRAPPERNAME} |
| 59 |
;; |
| 60 |
esac |
| 61 |
# Subshell, so as to not pollute the caller's env. |
| 62 |
@@ -226,7 +227,7 @@ |
| 63 |
) |
| 64 |
fi |
| 65 |
|
| 66 |
- rox_desktop_entry "${WRAPPERNAME}" "${APPNAME}" "${APPICON}" \ |
| 67 |
+ rox_desktop_entry "${WRAPPERNAME}" "${APPNAME}" "${WRAPPERNAME}" \ |
| 68 |
"${APPCATEGORY}" "MimeType=$(expandmime $APPMIME)" |
| 69 |
fi |
| 70 |
} |
| 71 |
|
| 72 |
|
| 73 |
|
| 74 |
-- |
| 75 |
gentoo-commits@g.o mailing list |
Archives