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 ea2a76200f09..e66b40424234 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]
--
2.12.2
