X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/aabbf4d8f3be25ce4e2253074a6c49ab7573ac03..4b9d80c0887c9792ebfbbb1c3bed79dc19173b18:/cookbooks/backup/files/default/expire-backups

diff --git a/cookbooks/backup/files/default/expire-backups b/cookbooks/backup/files/default/expire-backups
index 0cd75a502..f05026193 100644
--- a/cookbooks/backup/files/default/expire-backups
+++ b/cookbooks/backup/files/default/expire-backups
@@ -20,7 +20,7 @@ my @dates;
 
 if ($prefix)
 {
-    $prefix = "${prefix}-";
+    $prefix = "\Q${prefix}-\E";
 }
 else
 {
@@ -48,14 +48,18 @@ my $keep = qr/^${prefix}(?:${dates})\./;
 
 opendir(DIR, "$dir") || die "Can't open ${dir}: $!";
 
-while (my $file = readdir(DIR))
-{
-#    print "Expiring $file\n" if $file =~ $match && $file !~ $keep;
-    unlink("${dir}/${file}") if $file =~ $match && $file !~ $keep;
-}
+my @files = sort(grep(/$match/, readdir(DIR)));
 
 closedir(DIR);
 
+pop @files;
+
+for my $file (@files)
+{
+#    print "Expiring $file\n" if $file !~ $keep;
+    unlink("${dir}/${file}") if $file !~ $keep;
+}
+
 exit 0;
 
 sub Monday