diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
| commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
| tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /eclass/desktop.eclass | |
| parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) | |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'eclass/desktop.eclass')
| -rw-r--r-- | eclass/desktop.eclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/desktop.eclass b/eclass/desktop.eclass index 6fc72ab8ec03..7d5c0f0f9a26 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 @@ -10,7 +10,7 @@ if [[ -z ${_DESKTOP_ECLASS} ]]; then _DESKTOP_ECLASS=1 # @FUNCTION: make_desktop_entry -# @USAGE: make_desktop_entry(<command>, [name], [icon], [type], [fields]) +# @USAGE: <command> [name] [icon] [type] [fields] # @DESCRIPTION: # Make a .desktop file. # @@ -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:+;} |