diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-26 15:34:38 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-26 15:34:38 -0400 |
| commit | 1c00717cb2737bde3870b2fe504f40bb7d215477 (patch) | |
| tree | cd92f4cf3abde7a5398b7cb8c5ac16119ba6e5b5 /ikiwiki.in | |
| parent | cd029da49314981dad3ee89cc10946075825fb21 (diff) | |
| download | ikiwiki-1c00717cb2737bde3870b2fe504f40bb7d215477.tar ikiwiki-1c00717cb2737bde3870b2fe504f40bb7d215477.tar.gz | |
can now dump fully functional setup files
Diffstat (limited to 'ikiwiki.in')
| -rwxr-xr-x | ikiwiki.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ikiwiki.in b/ikiwiki.in index 70e44541c..8cb8a4769 100755 --- 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, |