aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--mandrake_desk.spec6
-rwxr-xr-xsbin/kdeDesktopCleanup2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 18fffc8..d6f79bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -75,6 +75,7 @@
2000-01-10 Pixel <pixel@mandrakesoft.com>
+ * sbin/kdeDesktopCleanup: fix an error case
* icons/mini/hd_umount.xpm: renamed in hd_unmount.xpm (for coherence)
2000-01-07 Frederic Lepied <flepied@mandrakesoft.com>
diff --git a/mandrake_desk.spec b/mandrake_desk.spec
index 331e47f..8af039d 100644
--- a/mandrake_desk.spec
+++ b/mandrake_desk.spec
@@ -1,4 +1,5 @@
-%define release 13mdk
+# DO NOT MODIFY HERE, modify in the CVS
+%define release 14mdk
%define name mandrake_desk
%define version 1.0.3
@@ -54,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
/usr/man/*/*
%changelog
+* Fri May 5 2000 Pixel <pixel@mandrakesoft.com> 1.0.3-14mdk
+- fix for kdeDesktopCleanup
+
* Thu May 04 2000 dam's <damien@mandrakesoft.com> 1.0.3-13mdk
- cleaned gnome desktop.
diff --git a/sbin/kdeDesktopCleanup b/sbin/kdeDesktopCleanup
index f00e44b..e92ea2c 100755
--- a/sbin/kdeDesktopCleanup
+++ b/sbin/kdeDesktopCleanup
@@ -5,7 +5,7 @@
@dirs = (qw(/etc/skel /root), glob("/home/*"));
@path = split ":", "/sbin:/usr/sbin:/usr/X11R6/bin:/bin:/usr/bin";
-foreach $f (map { grep { /\.kdelnk$/ } all("$_/Desktop") } @dirs) {
+foreach $f (map { grep { /\.kdelnk$/ } eval { all("$_/Desktop") } } @dirs) {
open F, $f or next;
L: foreach (<F>) {
$_ = "Exec=linuxconf" if $f =~ /linuxconf/i; # hack