Remove an unnecessary extglob setting where a simpler ${foo%.*} is going
to suffice, considering that the stripping is done conditionally after
checking that one of the supported suffixes is used.
---
eclass/eutils.eclass | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 68c2813..0844381 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -835,13 +835,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]
--
2.7.0
