Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/scripts
Modified Files:
e_gen_menu
Log Message:
Better parsing of Exec line in .desktop files (http://bugs.debian.org/345021).
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/scripts/e_gen_menu,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- e_gen_menu 10 Jun 2005 21:55:22 -0000 1.42
+++ e_gen_menu 3 Jan 2006 17:28:04 -0000 1.43
@@ -268,6 +268,9 @@
$Namx = "$Name-$N"; # Make key unique
$Namx =~ tr/A-Z/a-z/; # To lower case (for sorting)
+ $Exec =~ s/\s*%(f|F|i|k|m|n|N|u|U|v)//g; # Strip unwanted args
+ $Exec =~ s/\s*-\w+\s*"%c"//g; # Strip option with
caption
+# $Exec =~ s/"%c"/'$Name'/g; # Alternatively -
Substitute caption
$File{$Namx} = $File;
$Name{$Namx} = $Name;
$Exec{$Namx} = $Exec;
@@ -414,10 +417,8 @@
foreach $k (sort(@{$menus{$m}})) {
print " - Item: $k\n" if $dbg ge 2;
$icon = FindIcon($Icon{$k});
- @exec = split(' ', $Exec{$k});
- $exec = @exec[0];
printf FSubM "\"%s\" \"%s\" exec \"%s\"\n",
- $Name{$k}, $icon, $exec;
+ $Name{$k}, $icon, $Exec{$k};
}
close(FSubM);
}
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
