aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-05-09 17:54:32 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-05-09 17:54:32 +0000
commitc70a61b52ba1a5ecd5daff0ebcc17b3eec820c2f (patch)
tree575ce28d65b58e7a9f69c26b1da403091e7ec7e9
parent722ed23ea08a7d8a2de9b29a7af51b3ada67a725 (diff)
downloadcommon-data-c70a61b52ba1a5ecd5daff0ebcc17b3eec820c2f.tar
common-data-c70a61b52ba1a5ecd5daff0ebcc17b3eec820c2f.tar.gz
common-data-c70a61b52ba1a5ecd5daff0ebcc17b3eec820c2f.tar.bz2
common-data-c70a61b52ba1a5ecd5daff0ebcc17b3eec820c2f.tar.xz
common-data-c70a61b52ba1a5ecd5daff0ebcc17b3eec820c2f.zip
*** empty log message ***
-rw-r--r--ChangeLog4
-rwxr-xr-xsbin/kdeDesktopCleanup11
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e26f25..80b2dc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-09 Pixel <pixel@mandrakesoft.com>
+
+ * sbin/kdeDesktopCleanup: added handling of URL kdelnk's
+
2000-05-09 dam's <damien@mandrakesoft.com>
* corrected Netscape and rpmdrake gnome icons
diff --git a/sbin/kdeDesktopCleanup b/sbin/kdeDesktopCleanup
index e92ea2c..1ff6ea0 100755
--- a/sbin/kdeDesktopCleanup
+++ b/sbin/kdeDesktopCleanup
@@ -8,14 +8,15 @@
foreach $f (map { grep { /\.kdelnk$/ } eval { all("$_/Desktop") } } @dirs) {
open F, $f or next;
L: foreach (<F>) {
- $_ = "Exec=linuxconf" if $f =~ /linuxconf/i; # hack
-
- ($l) = /^Exec=(?:kdesu\s+-c\s+)?"?(\S+)/ or next;
- -x "$_/$l" and last L foreach '', @path;
+ if (/^Exec=(?:kdesu\s+-c\s+)?"?(\S+)/) {
+ -x "$_/$1" and last L foreach '', @path;
+ } elsif (m|^URL=file:(/.*)|) {
+ -e $1 and last;
+ } else { next }
print STDERR "removing $f\n";
unlink $f;
last;
- }
+ }
}
sub all {