Merge branch 'master' into pedigree

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 25f038a064ac8ceab4333f0d93ba13b1203262f2..f67c3829b71d437dc73ed7477196d9323247ece4 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -3,74 +3,13 @@
 # Parameters to import should be all the standard ikiwiki config stuff,
 # plus an array of wrappers to set up.
 
 # Parameters to import should be all the standard ikiwiki config stuff,
 # plus an array of wrappers to set up.
 

+package IkiWiki::Setup::Standard;
+

 use warnings;
 use strict;
 use warnings;
 use strict;

-use IkiWiki::Wrapper;
-use IkiWiki::Render;
-
-package IkiWiki::Setup::Standard;

 
 sub import {
 
 sub import {

-       IkiWiki::setup_standard(@_);
-}
-       
-package IkiWiki;
-
-sub setup_standard {
-       my %setup=%{$_[1]};
-
-       $setup{plugin}=$config{plugin};
-       if (exists $setup{add_plugins}) {
-               push @{$setup{plugin}}, @{$setup{add_plugins}};
-               delete $setup{add_plugins};
-       }
-       if (exists $setup{disable_plugins}) {
-               foreach my $plugin (@{$setup{disable_plugins}}) {
-                       $setup{plugin}=[grep { $_ ne $plugin } @{$setup{plugin}}];
-               }
-               delete $setup{disable_plugins};
-       }
-
-       debug("generating wrappers..");
-       my @wrappers=@{$setup{wrappers}};
-       delete $setup{wrappers};
-       my %startconfig=(%config);
-       foreach my $wrapper (@wrappers) {
-               %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
-               checkconfig();
-               gen_wrapper();
-       }
-       %config=(%startconfig);
-       
-       foreach my $c (keys %setup) {
-               if (defined $setup{$c}) {
-                       if (! ref $setup{$c}) {
-                               $config{$c}=possibly_foolish_untaint($setup{$c});
-                       }
-                       elsif (ref $setup{$c} eq 'ARRAY') {
-                               $config{$c}=[map { possibly_foolish_untaint($_) } @{$setup{$c}}]
-                       }
-               }
-               else {
-                       $config{$c}=undef;
-               }
-       }
-
-       if (! $config{refresh}) {
-               $config{rebuild}=1;
-               debug("rebuilding wiki..");
-       }
-       else {
-               debug("refreshing wiki..");
-       }
-
-       checkconfig();
-       lockwiki();
-       loadindex();
-       refresh();
-
-       debug("done");
-       saveindex();
+       $IkiWiki::Setup::raw_setup=$_[1];

 }
 
 1
 }
 
 1