summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2020-03-25 08:50:42 +0100
committerUlrich Müller <ulm@gentoo.org>2020-03-27 08:27:28 +0100
commit2884bb5a7f44da2fcca598329ce14bff0d12289c (patch)
tree8cae3c37e7d24af865b36e09cef0e8daa095eee0 /eclass/desktop.eclass
parentdev-python/dulwich: Remove redundant versions (diff)
downloadgentoo-2884bb5a7f44da2fcca598329ce14bff0d12289c.tar.gz
gentoo-2884bb5a7f44da2fcca598329ce14bff0d12289c.tar.bz2
gentoo-2884bb5a7f44da2fcca598329ce14bff0d12289c.zip
desktop.eclass: Sanitize filename of desktop entry.
make_desktop_entry() extracts the first component of the filename from the Exec key in the desktop entry. This can however include arguments which will end up in the filename. For example, www-client/links has "Exec=links -g %u", resulting in links_-g_%u-links-2.desktop as the name of the file. The current extraction pattern originates from this CVS commit: https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.271&r2=1.272 with the commit message "scrub exec filename in case someone does something silly like pass the fullpath to a binary". Before that commit, anything after a space in Exec would have been removed. Restore that behaviour, and in addition use only the executable's basename. While at it, get rid of the sed call and handle everything in bash. Signed-off-by: Ulrich Müller <ulm@gentoo.org>
Diffstat (limited to 'eclass/desktop.eclass')
-rw-r--r--eclass/desktop.eclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/desktop.eclass b/eclass/desktop.eclass
index 6fc72ab8ec0..f310f210dfb 100644
--- a/eclass/desktop.eclass
+++ b/eclass/desktop.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: desktop.eclass
@@ -162,8 +162,8 @@ make_desktop_entry() {
else
local desktop_name="${PN}-${slot}"
fi
- local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
- #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
+ local desktop="${exec%%[[:space:]]*}"
+ desktop="${T}/${desktop##*/}-${desktop_name}.desktop"
# Don't append another ";" when a valid category value is provided.
type=${type%;}${type:+;}