kwo pushed a commit to branch master. http://git.enlightenment.org/e16/e16.git/commit/?id=cb8103490219e96602b6d2b37f7dddc1f085ab00
commit cb8103490219e96602b6d2b37f7dddc1f085ab00 Author: Kim Woelders <[email protected]> Date: Sat Mar 30 08:05:06 2019 +0100 e_gen_menu: Various corrections and tweaks - Fix /usr/share/enlightenment -> /usr/share/e16 - Add mimetypes to IconCats - Avoid duplicates Thanks to Thanatermesis --- scripts/e_gen_menu | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/e_gen_menu b/scripts/e_gen_menu index 5ccf2827..6a9818ec 100755 --- a/scripts/e_gen_menu +++ b/scripts/e_gen_menu @@ -39,7 +39,7 @@ $AppDirs = MkDirList($Prefixes, "/share/applications:/share/applications/kde:/sh $IconDirs = MkDirList($Prefixes, "/share/pixmaps:/share/icons"); $IconDirs2 = MkDirList($Prefixes, "/share/icons"); $Themes = "default.kde:gnome:hicolor:Adwaita"; -$IconCats = "apps:filesystems:actions:devices:categories:places"; +$IconCats = "apps:filesystems:actions:devices:categories:places:mimetypes"; # Where to look for GNOME1 apps $OldGnomeDirs = MkDirList($Prefixes, "/share/gnome/apps"); @@ -59,7 +59,7 @@ $loc3 =~ s/_.*//; $loc1 = "" if ($loc1 eq $loc2); $EdirUser = "$ENV{'HOME'}/.e16" unless $EdirUser; -$EdirRoot = "/usr/share/enlightenment" unless $EdirRoot; +$EdirRoot = "/usr/share/e16" unless $EdirRoot; $EdirBin = "/usr/bin" unless $EdirBin; $EdirMenus = "$EdirUser/menus"; @@ -279,6 +279,7 @@ sub ProcessFile { $Type{$Namx} = $Type; } +my %seen; # Process all .desktop files in a directory sub ProcessDir { local $d = shift; @@ -289,6 +290,8 @@ sub ProcessDir { @l = grep /\.desktop$/, ReadDir($d); foreach $f (@l) { + next if ($seen{$f}); + $seen{$f} = 1; $f = "$d/$f"; print "- File $f\n" if $dbg ge 2; ProcessFile("$f", "$dx", "$t"); --
