1 |
wolf31o2 07/11/20 22:32:02 |
2 |
|
3 |
Modified: eutils.eclass |
4 |
Log: |
5 |
Added a couple minor fixes for make_desktop_entry to clean it up, per discussion on the gentoo-dev mailing list. This closes bug #181999 and bug #197891. Thanks to Carsten Lohrke <carlo@g.o>, Samuli Suominen <drac@g.o, and Daniel Pielmeier <daniel.pielmeier@××××××××××.com>. |
6 |
|
7 |
Revision Changes Path |
8 |
1.293 eclass/eutils.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.eclass?rev=1.293&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.eclass?rev=1.293&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.eclass?r1=1.292&r2=1.293 |
13 |
|
14 |
Index: eutils.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v |
17 |
retrieving revision 1.292 |
18 |
retrieving revision 1.293 |
19 |
diff -u -r1.292 -r1.293 |
20 |
--- eutils.eclass 14 Oct 2007 21:55:35 -0000 1.292 |
21 |
+++ eutils.eclass 20 Nov 2007 22:32:01 -0000 1.293 |
22 |
@@ -1,6 +1,6 @@ |
23 |
# Copyright 1999-2007 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.292 2007/10/14 21:55:35 vapier Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.293 2007/11/20 22:32:01 wolf31o2 Exp $ |
27 |
|
28 |
# @ECLASS: eutils.eclass |
29 |
# @MAINTAINER: |
30 |
@@ -741,7 +741,7 @@ |
31 |
|
32 |
local exec=${1} |
33 |
local name=${2:-${PN}} |
34 |
- local icon=${3:-${PN}.png} |
35 |
+ local icon=${3:-${PN}} |
36 |
local type=${4} |
37 |
local path=${5} |
38 |
|
39 |
@@ -875,18 +875,18 @@ |
40 |
|
41 |
cat <<-EOF > "${desktop}" |
42 |
[Desktop Entry] |
43 |
- Encoding=UTF-8 |
44 |
Version=1.0 |
45 |
Name=${name} |
46 |
Type=Application |
47 |
Comment=${DESCRIPTION} |
48 |
Exec=${exec} |
49 |
TryExec=${exec%% *} |
50 |
- Path=${path} |
51 |
Icon=${icon} |
52 |
Categories=${type}; |
53 |
EOF |
54 |
|
55 |
+ [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" |
56 |
+ |
57 |
( |
58 |
# wrap the env here so that the 'insinto' call |
59 |
# doesn't corrupt the env of the caller |
60 |
@@ -938,7 +938,6 @@ |
61 |
|
62 |
cat <<-EOF > "${desktop}" |
63 |
[Desktop Entry] |
64 |
- Encoding=UTF-8 |
65 |
Name=${title} |
66 |
Comment=This session logs you into ${title} |
67 |
Exec=${command} |
68 |
|
69 |
|
70 |
|
71 |
-- |
72 |
gentoo-commits@g.o mailing list |