X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2eb5893ce7095475cadc07f9f3b0c50eb6efc68d..4ed0a630cb8a10d583c5e88cc7a87a5cecdedc8d:/IkiWiki/Setup/Standard.pm diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm index 4d1118f30..f67c3829b 100644 --- a/IkiWiki/Setup/Standard.pm +++ b/IkiWiki/Setup/Standard.pm @@ -1,8 +1,7 @@ #!/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. +# plus an array of wrappers to set up. package IkiWiki::Setup::Standard; @@ -10,28 +9,7 @@ use warnings; use strict; sub import { - my %setup=%{$_[1]}; - - ::debug("generating wrappers.."); - my %startconfig=(%::config); - foreach my $wrapper (@{$setup{wrappers}}) { - %::config=(%startconfig, verbose => 0, %setup, %{$wrapper}); - ::checkoptions(); - ::gen_wrapper(); - } - %::config=(%startconfig); - - ::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(); - - ::debug("done"); - ::saveindex(); + $IkiWiki::Setup::raw_setup=$_[1]; } 1