1 |
vip-ire |
1.1 |
diff -Nur smeserver-shared-folders-0.1/root/etc/cron.daily/purge-shares-recycle smeserver-shared-folders-0.1_mod/root/etc/cron.daily/purge-shares-recycle |
2 |
|
|
--- smeserver-shared-folders-0.1/root/etc/cron.daily/purge-shares-recycle 2011-04-05 19:24:26.000000000 +0200 |
3 |
|
|
+++ smeserver-shared-folders-0.1_mod/root/etc/cron.daily/purge-shares-recycle 2011-04-05 19:25:10.000000000 +0200 |
4 |
|
|
@@ -37,7 +37,7 @@ |
5 |
|
|
my $dir = $share->prop('RecycleBinDir') || 'Recycle Bin'; |
6 |
|
|
# Skip if dir contains ./ |
7 |
|
|
next if $dir =~ m#(\./)#; |
8 |
|
|
- find(\&remove, "/home/e-smith/files/shares/$key/files/$dir/"); |
9 |
|
|
+ finddepth(\&remove, "/home/e-smith/files/shares/$key/files/$dir/"); |
10 |
|
|
} |
11 |
|
|
|
12 |
|
|
sub remove{ |
13 |
|
|
@@ -48,7 +48,7 @@ |
14 |
|
|
} |
15 |
|
|
# Remove empty directories |
16 |
|
|
elsif ( -d ){ |
17 |
|
|
- (scalar <"$_/*">) || rmdir($_); |
18 |
|
|
+ (scalar <"$_/*">) || rmdir("$_"); |
19 |
|
|
} |
20 |
|
|
} |
21 |
|
|
|