mixing template vars into directive arguments

[git.ikiwiki.info.git] / IkiWiki / Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index c6167b437fde4de7d19c2de1e48cc5b4e04b9f40..7ea919abc3d76c2b9fc280c81ed4f87cbb95d8cb 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -174,15 +174,15 @@ sub scan ($) {
                }
                delete $typedlinks{$page};
 
+               # Preprocess in scan-only mode.
+               preprocess($page, $page, $content, 1);
+
                run_hooks(scan => sub {
                        shift->(
                                page => $page,
                                content => $content,
                        );
                });
-
-               # Preprocess in scan-only mode.
-               preprocess($page, $page, $content, 1);
        }
        else {
                will_render($file, $file, 1);
@@ -335,21 +335,22 @@ sub find_src_files () {
                }
        };
 
-       chdir($config{srcdir}) || die "chdir: $!";
+       chdir($config{srcdir}) || die "chdir $config{srcdir}: $!";
        find({
                no_chdir => 1,
                wanted => $helper,
        }, '.');
-       chdir($origdir) || die "chdir: $!";
+       chdir($origdir) || die "chdir $origdir: $!";
 
        $underlay=1;
        foreach (@{$config{underlaydirs}}, $config{underlaydir}) {
-               chdir($_) || die "chdir: $!";
-               find({
-                       no_chdir => 1,
-                       wanted => $helper,
-               }, '.');
-               chdir($origdir) || die "chdir: $!";
+               if (chdir($_)) {
+                       find({
+                               no_chdir => 1,
+                               wanted => $helper,
+                       }, '.');
+                       chdir($origdir) || die "chdir: $!";
+               }
        };
 
        return \@files, \%pages;
@@ -373,7 +374,7 @@ sub find_new_files ($) {
                        }
 
                        eval {
-                               my $ctime=rcs_getctime("$config{srcdir}/$file");
+                               my $ctime=rcs_getctime($file);
                                if ($ctime > 0) {
                                        $pagectime{$page}=$ctime;
                                }
@@ -383,7 +384,7 @@ sub find_new_files ($) {
                        }
                        my $mtime;
                        eval {
-                               $mtime=rcs_getmtime("$config{srcdir}/$file");
+                               $mtime=rcs_getmtime($file);
                        };
                        if ($@) {
                                print STDERR $@;
@@ -758,7 +759,10 @@ sub refresh () {
        my ($new, $internal_new)=find_new_files($files);
        my ($del, $internal_del)=find_del_files($pages);
        my ($changed, $internal_changed)=find_changed($files);
-       run_hooks(needsbuild => sub { shift->($changed) });
+       run_hooks(needsbuild => sub {
+               my $ret=shift->($changed, [@$del, @$internal_del]);
+               $changed=$ret if ref $ret eq 'ARRAY';
+       });
        my $oldlink_targets=calculate_old_links($changed, $del);
 
        foreach my $file (@$changed) {