Merge branch 'master' of git://git.ikiwiki.info into bugs

[ikiwiki.git] / IkiWiki / Setup / Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index c5a67afdf7cce69f4e1fea08f7dae4b377f14111..f67c3829b71d437dc73ed7477196d9323247ece4 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -1,48 +1,15 @@
 #!/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;
 
 use warnings;
 use strict;
-use IkiWiki::Wrapper;
-use IkiWiki::Render;
-
-package IkiWiki::Setup::Standard;
 
 sub import {
-       IkiWiki::setup_standard(@_);
-}
-       
-package IkiWiki;
-
-sub setup_standard {
-       my %setup=%{$_[1]};
-
-       debug("generating wrappers..");
-       my %startconfig=(%config);
-       foreach my $wrapper (@{$setup{wrappers}}) {
-               %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
-               checkconfig();
-               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;
-
-       checkconfig();
-       lockwiki();
-       loadindex();
-       refresh();
-
-       debug("done");
-       saveindex();
+       $IkiWiki::Setup::raw_setup=$_[1];
 }
 
 1