make monotone use hooks, add getsetup

[ikiwiki.git] / ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index 5dc6ca952e17b0702cd42e2f1ac57509e5248710..febc8ff56ed42ee876b85db2b235270961737963 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -28,7 +28,7 @@ sub getconfig () { #{{{
                        "refresh!" => \$config{refresh},
                        "post-commit" => \$config{post_commit},
                        "render=s" => \$config{render},
-                       "wrappers!" => \$config{wrappers},
+                       "wrappers!" => \$config{genwrappers},
                        "usedirs!" => \$config{usedirs},
                        "prefix-directives!" => \$config{prefix_directives},
                        "getctime" => \$config{getctime},
@@ -68,7 +68,7 @@ sub getconfig () { #{{{
                                $config{wrappermode}=possibly_foolish_untaint($_[1])
                        },
                        "plugin=s@" => sub {
-                               push @{$config{plugin}}, $_[1];
+                               push @{$config{add_plugins}}, $_[1];
                        },
                        "disable-plugin=s@" => sub {
                                push @{$config{disable_plugins}}, $_[1];
@@ -112,13 +112,15 @@ sub main () { #{{{
        if ($config{setup}) {
                require IkiWiki::Setup;
                IkiWiki::Setup::load($config{setup});
-               if (! $config{render} && ! $config{dumpsetup} &&
-                   (! $config{refresh} || $config{wrappers})) {
+               if (@{$config{wrappers}} && 
+                   ! $config{render} && ! $config{dumpsetup} &&
+                   (! $config{refresh} || $config{genwrappers})) {
                        debug(gettext("generating wrappers.."));
                        require IkiWiki::Wrapper;
                        my %origconfig=(%config);
                        my @wrappers=@{$config{wrappers}};
                        delete $config{wrappers};
+                       delete $config{genwrappers};
                        foreach my $wrapper (@wrappers) {
                                %config=(%origconfig,
                                        rebuild => 0,
@@ -141,15 +143,15 @@ sub main () { #{{{
                
                # ignore syslog setting from setup file
                # while doing initial setup
-               $config{syslog}=0;      
+               $config{syslog}=0 unless $config{dumpsetup};
                
                loadplugins();
                checkconfig();
        }
 
        if ($config{dumpsetup}) {
-               require IkiWiki::Setup::Standard;
-               IkiWiki::Setup::Standard::dump($config{dumpsetup});
+               require IkiWiki::Setup;
+               IkiWiki::Setup::dump($config{dumpsetup});
        }
        elsif ($config{wrapper}) {
                lockwiki();