presence dependencies not needed

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

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 0baf112ffd722c3ca133c92be2dd5982e01801ab..ff110b5ffb9763cb5fbb9248c0b5d95bc52fb5e1 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -37,15 +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_args="        return 0;";
-       run_hooks(wrapperargcheck => sub { $check_args = shift->(); });
+       
+       my @wrapper_hooks;
+       run_hooks(genwrapper => sub { push @wrapper_hooks, shift->() });
 
        my $check_commit_hook="";
        my $pre_exec="";
@@ -119,18 +113,11 @@ addenv(char *var, char *val) {
        newenviron[i++]=s;
 }
 
-int checkargs(int argc, char **argv) {
-$check_args
-}
-
 int main (int argc, char **argv) {
        char *s;
 
-       if (!checkargs(argc, argv))
-               exit(0);
-
 $check_commit_hook
-$test_receive
+@wrapper_hooks
 $envsave
        newenviron[i++]="HOME=$ENV{HOME}";
        newenviron[i++]="WRAPPED_OPTIONS=$configstring";
@@ -154,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) {