| 1 |
Remove an unnecessary extglob setting where a simpler ${foo%.*} is going |
| 2 |
to suffice, considering that the stripping is done conditionally after |
| 3 |
checking that one of the supported suffixes is used. |
| 4 |
--- |
| 5 |
eclass/eutils.eclass | 6 ++---- |
| 6 |
1 file changed, 2 insertions(+), 4 deletions(-) |
| 7 |
|
| 8 |
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass |
| 9 |
index 68c2813..0844381 100644 |
| 10 |
--- a/eclass/eutils.eclass |
| 11 |
+++ b/eclass/eutils.eclass |
| 12 |
@@ -1,4 +1,4 @@ |
| 13 |
-# Copyright 1999-2015 Gentoo Foundation |
| 14 |
+# Copyright 1999-2016 Gentoo Foundation |
| 15 |
# Distributed under the terms of the GNU General Public License v2 |
| 16 |
# $Id$ |
| 17 |
|
| 18 |
@@ -835,13 +835,11 @@ make_desktop_entry() { |
| 19 |
# Don't append another ";" when a valid category value is provided. |
| 20 |
type=${type%;}${type:+;} |
| 21 |
|
| 22 |
- eshopts_push -s extglob |
| 23 |
if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then |
| 24 |
ewarn "As described in the Icon Theme Specification, icon file extensions are not" |
| 25 |
ewarn "allowed in .desktop files if the value is not an absolute path." |
| 26 |
- icon=${icon%.@(xpm|png|svg)} |
| 27 |
+ icon=${icon%.*} |
| 28 |
fi |
| 29 |
- eshopts_pop |
| 30 |
|
| 31 |
cat <<-EOF > "${desktop}" |
| 32 |
[Desktop Entry] |
| 33 |
-- |
| 34 |
2.7.0 |
Archives