X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d3d399941061d95cd4aae6ae2cf7594a4e5e7452..430ac61f2142bc92b12d16067ca7b40202d0c589:/ikiwiki.in?ds=sidebyside diff --git a/ikiwiki.in b/ikiwiki.in index af5cabdc0..473cbdbfd 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -40,6 +40,7 @@ sub getconfig () { #{{{ "post-commit" => \$config{post_commit}, "render=s" => \$config{render}, "wrappers!" => \$config{genwrappers}, + "wrappergroup=s" => \$config{wrappergroup}, "usedirs!" => \$config{usedirs}, "prefix-directives!" => \$config{prefix_directives}, "getctime" => \$config{getctime}, @@ -98,7 +99,7 @@ sub getconfig () { #{{{ "help|h" => sub { $SIG{__WARN__}=sub {}; die }, ) || usage(); - if (! $config{setup} && ! $config{render}) { + if (! $config{setup}) { loadplugins(); if (@ARGV == 2) { $config{srcdir} = possibly_foolish_untaint(shift @ARGV); @@ -156,13 +157,15 @@ sub main () { #{{{ } # setup implies a wiki rebuild by default - if (! $config{refresh}) { + if (! $config{refresh} && ! $config{render}) { $config{rebuild}=1; } } if ($config{dumpsetup}) { - $config{srdir}=$config{destdir}=""; + $config{srcdir}="" if ! defined $config{srcdir}; + $config{destdir}="" if ! defined $config{destdir}; + $config{syslog}=1 if $config{setupsyslog}; require IkiWiki::Setup; IkiWiki::Setup::dump($config{dumpsetup}); }