Merge branch 'master' into dependency-types

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

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index cc2223d7a4ded0277c9e594b67841449cdd7bd50..ff110b5ffb9763cb5fbb9248c0b5d95bc52fb5e1 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -37,24 +37,9 @@ sub gen_wrapper () {
                addenv("$var", s);
 EOF
        }
-
-       my $test_receive="";
-       if ($config{test_receive}) {
-               require IkiWiki::Receive;
-               $test_receive=IkiWiki::Receive::gen_wrapper();
-       }
-
-       my $check_cvs_add_dir="";
-       if ($config{rcs} eq 'cvs') {
-               $check_cvs_add_dir=<<"EOF";
-       {
-               int j;
-               for (j = 1; j < argc; j++)
-                       if (strstr(argv[j], "New directory") != NULL)
-                               exit(0);
-       }
-EOF
-       }
+       
+       my @wrapper_hooks;
+       run_hooks(genwrapper => sub { push @wrapper_hooks, shift->() });
 
        my $check_commit_hook="";
        my $pre_exec="";
@@ -131,9 +116,8 @@ addenv(char *var, char *val) {
 int main (int argc, char **argv) {
        char *s;
 
-$check_cvs_add_dir
 $check_commit_hook
-$test_receive
+@wrapper_hooks
 $envsave
        newenviron[i++]="HOME=$ENV{HOME}";
        newenviron[i++]="WRAPPED_OPTIONS=$configstring";
@@ -157,7 +141,6 @@ $pre_exec
        exit(1);
 }
 EOF
-       close OUT;
 
        my $cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc';
        if (system($cc, "$wrapper.c", "-o", "$wrapper.new") != 0) {