X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e3b9e716d093497c1748f92f333f00a47a4272fa..8d9ec24232ede981face0c3eafbce71b74c4725a:/IkiWiki/Setup/Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 9aa9299ea..f67c3829b 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -1,45 +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});
-		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