commit: 9433c94ae5befe90b431248ffcaf80d90195ccde
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 14 17:20:57 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 17:57:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9433c94a
eutils.eclass: make_desktop_entry, replace unnecessary extglob
Replace the unnecessary use of extglob to strip file suffix
in make_desktop_entry with a plain ${x%.*}. This is pretty much
equivalent since match to one of the pre-defined suffixes is already
confirmed via the preceding conditional, and avoiding repeating
the suffix list twice makes the code simpler.
eclass/eutils.eclass | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index ea2a76200f0..e66b4042423 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -275,13 +275,11 @@ make_desktop_entry() {
# Don't append another ";" when a valid category value is provided.
type=${type%;}${type:+;}
- eshopts_push -s extglob
if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon}
== *.png || ${icon} == *.svg ]]; then
ewarn "As described in the Icon Theme Specification, icon file
extensions are not"
ewarn "allowed in .desktop files if the value is not an
absolute path."
- icon=${icon%.@(xpm|png|svg)}
+ icon=${icon%.*}
fi
- eshopts_pop
cat <<-EOF > "${desktop}"
[Desktop Entry]
