aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorAmitai Schlair <schmonz@magnetic-babysitter.(none)>2009-09-10 15:03:18 -0400
committerAmitai Schlair <schmonz@magnetic-babysitter.(none)>2009-09-10 15:03:18 -0400
commit460b1a0debf85f7c54c1dd7d8b8e483587041d44 (patch)
treef3acb8362efffe43a94a482ba07cbc6626fc8e0e /IkiWiki
parent98553d15375a373bd769b82cea24b48ee9613662 (diff)
parent525d4cd037b1da19f4d54cf113212cbe452be417 (diff)
downloadikiwiki-460b1a0debf85f7c54c1dd7d8b8e483587041d44.tar
ikiwiki-460b1a0debf85f7c54c1dd7d8b8e483587041d44.tar.gz
Merge branch 'master' of git://github.com/joeyh/ikiwiki
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/skeleton.pm.example5
-rw-r--r--IkiWiki/Wrapper.pm8
2 files changed, 9 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example
index 573510191..ddf2996d6 100644
--- a/IkiWiki/Plugin/skeleton.pm.example
+++ b/IkiWiki/Plugin/skeleton.pm.example
@@ -39,6 +39,7 @@ sub import {
hook(type => "renamepage", id => "skeleton", call => \&renamepage);
hook(type => "rename", id => "skeleton", call => \&rename);
hook(type => "savestate", id => "skeleton", call => \&savestate);
+ hook(type => "genwrapper", id => "skeleton", call => \&genwrapper);
}
sub getopt () {
@@ -239,4 +240,8 @@ sub savestate () {
debug("skeleton plugin running in savestate");
}
+sub genwrapper () {
+ debug("skeleton plugin running in genwrapper");
+}
+
1
diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 0baf112ff..57896e262 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -38,11 +38,12 @@ sub gen_wrapper () {
EOF
}
- my $test_receive="";
if ($config{test_receive}) {
require IkiWiki::Receive;
- $test_receive=IkiWiki::Receive::gen_wrapper();
}
+
+ my @wrapper_hooks;
+ run_hooks(genwrapper => sub { push @wrapper_hooks, shift->() });
my $check_args=" return 0;";
run_hooks(wrapperargcheck => sub { $check_args = shift->(); });
@@ -130,7 +131,7 @@ int main (int argc, char **argv) {
exit(0);
$check_commit_hook
-$test_receive
+@wrapper_hooks
$envsave
newenviron[i++]="HOME=$ENV{HOME}";
newenviron[i++]="WRAPPED_OPTIONS=$configstring";
@@ -154,7 +155,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) {