calendar: Tune archive_pagespec to only match pages, not other files.

[git.ikiwiki.info.git] / IkiWiki / Plugin / autoindex.pm

diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index 23a17d4e9d9d38a6babe413bbca766a50730119c..0dd76259e0e74483f408eaec88e1d213aae45f79 100644 (file)
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -36,13 +36,17 @@ sub refresh () {
 
        my (%pages, %dirs);
        foreach my $dir ($config{srcdir}, @{$config{underlaydirs}}, $config{underlaydir}) {
+               require File::Spec;
+               $dir=File::Spec->canonpath($dir);
+
                find({
                        no_chdir => 1,
                        wanted => sub {
-                               my $file=decode_utf8($_);
+                               my $file=File::Spec->canonpath(decode_utf8($_));
+                               return if $file eq $dir;
                                $file=~s/^\Q$dir\E\/?//;
                                return unless length $file;
-                               if (IkiWiki::file_pruned($_)) {
+                               if (IkiWiki::file_pruned($file)) {
                                        $File::Find::prune=1;
                                }
                                elsif (! -l $_) {