Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/scripts
Modified Files:
Tag: branch-exp
Makefile.am e_cache_clean e_gen_menu
Removed Files:
Tag: branch-exp
e_cache_clean.pl e_cache_query.pl e_gen_gnome_menu
e_gen_kde_menu e_gen_menu.e16_5 e_gen_menu.pl
enlightenment.install.in
Log Message:
Merge.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/scripts/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -3 -r1.14 -r1.14.2.1
--- Makefile.am 6 Sep 2003 19:55:42 -0000 1.14
+++ Makefile.am 2 Oct 2004 12:27:46 -0000 1.14.2.1
@@ -1,9 +1,5 @@
-EXTRA_DIST = e_gen_kde_menu e_gen_menu e_gen_gnome_menu e_cache_clean \
-e_cache_query enlightenment.install.in e_gen_menu.e16_5 \
-e_gen_menu.pl e_cache_clean.pl e_cache_query.pl
-script_SCRIPTS = e_gen_kde_menu e_gen_menu e_gen_gnome_menu e_cache_clean \
-e_cache_query enlightenment.install e_gen_menu.e16_5 \
-e_gen_menu.pl e_cache_clean.pl e_cache_query.pl
+EXTRA_DIST = e_gen_menu e_cache_clean e_cache_query
+script_SCRIPTS = e_gen_menu e_cache_clean e_cache_query
scriptdir = $(ENLIGHTENMENT_ROOT)/scripts
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/scripts/e_cache_clean,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -3 -r1.13 -r1.13.2.1
--- e_cache_clean 19 Jan 2004 22:30:27 -0000 1.13
+++ e_cache_clean 2 Oct 2004 12:27:46 -0000 1.13.2.1
@@ -34,12 +34,8 @@
fi
if [ $1 = "all" ]; then
- rm -rf $ECACHEDIR/cached/bgsel/* >/dev/null 2>&1
- rm -rf $ECACHEDIR/cached/bgsel/.* >/dev/null 2>&1
- rm -rf $ECACHEDIR/cached/cfg/* >/dev/null 2>&1
- rm -rf $ECACHEDIR/cached/cfg/.* >/dev/null 2>&1
- rm -rf $ECACHEDIR/cached/pager/* >/dev/null 2>&1
- rm -rf $ECACHEDIR/cached/pager/.* >/dev/null 2>&1
+ rm -rf $ECACHEDIR/cached/*/* >/dev/null 2>&1
+ rm -rf $ECACHEDIR/cached/*/.* >/dev/null 2>&1
eesh -e "dialog_ok All caches purged."
exit
fi
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/scripts/e_gen_menu,v
retrieving revision 1.33.2.3
retrieving revision 1.33.2.4
diff -u -3 -r1.33.2.3 -r1.33.2.4
--- e_gen_menu 18 Sep 2004 13:32:25 -0000 1.33.2.3
+++ e_gen_menu 2 Oct 2004 12:27:46 -0000 1.33.2.4
@@ -25,7 +25,8 @@
##############################################################################
# Likely prefixes
-$Prefixes = "/usr/local:/usr:/opt:/opt/kde";
+$Prefixes = "/usr/local:/usr:/opt::/opt/kde:$ENV{'KDEDIR'}";
+$Prefixes = RemoveDuplcates($Prefixes);
# Where to look for GNOME2/KDE2,3 stuff
$AppDirs = MkDirList($Prefixes, "/share/applications:/share/applications/kde");
@@ -129,13 +130,27 @@
"x:XMMS:xmms"
);
+# Remove duplicates and nulls in ':' separated dir list
+sub RemoveDuplcates {
+ local $dl = shift;
+ local @r;
+ local %h;
+ foreach $p (split(':', $dl)) {
+ next unless $p;
+ next if $h{$p};
+ $h{$p} = $p;
+ push @r, $p;
+ }
+ return join(':', @r);
+}
+
# Make : separated directory list, check that they exist
sub MkDirList {
- local $ll = shift;
+ local $dl = shift;
local $sf = shift;
local $d;
local @r;
- foreach $p (split(':', $ll)) {
+ foreach $p (split(':', $dl)) {
foreach $q (split(':', $sf)) {
$d = "$p$q";
push(@r, "$d") if -d "$d";
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
