X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/e4d9da55d923cdd78cd07959de44edf17a9a5fe5..5d26ded3811cd050a1c70ccf76f3022a787a9588:/IkiWiki/Setup/Standard.pm diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm index 76213b11a..693c4fe60 100644 --- a/IkiWiki/Setup/Standard.pm +++ b/IkiWiki/Setup/Standard.pm @@ -1,35 +1,17 @@ #!/usr/bin/perl # Standard ikiwiki setup module. # Parameters to import should be all the standard ikiwiki config stuff, -# plus hashes for cgiwrapper and svnwrapper, which specify any differing -# config stuff for them and cause the wrappers to be made. - -package IkiWiki::Setup::Standard; +# plus an array of wrappers to set up. use warnings; use strict; +use IkiWiki::Wrapper; +use IkiWiki::Render; -sub import { - my %setup=%{$_[1]}; - - ::debug("generating wrappers.."); - foreach my $wrapper (@{$setup{wrappers}}) { - %::config=(%::config, verbose => 0, %setup, %{$wrapper}); - ::checkoptions(); - ::gen_wrapper(); - } - - ::debug("rebuilding wiki.."); - foreach my $c (keys %setup) { - $::config{$c}=::possibly_foolish_untaint($setup{$c}) - if defined $setup{$c} && ! ref $setup{$c}; - } - $::config{rebuild}=1; - ::checkoptions(); - ::refresh(); +package IkiWiki::Setup::Standard; - ::debug("done"); - ::saveindex(); +sub import { + $IkiWiki::Setup::raw_setup=$_[1]; } 1