another sub, wow

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 68f43b408924ecb173c61f530d3c1250059fc2c7..56ed5ab3b553e7f17b3b257cc82ee94049821770 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -4,29 +4,44 @@
 # 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;
-
 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..");
+       debug("generating wrappers..");
+       my %startconfig=(%config);
        foreach my $wrapper (@{$setup{wrappers}}) {
-               ::gen_wrapper(%::config, verbose => 0, %setup, %{$wrapper});
+               %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
+               checkconfig();
+               gen_wrapper();
        }
-
-       ::debug("rebuilding wiki..");
+       %config=(%startconfig);
+       
+       debug("rebuilding wiki..");
        foreach my $c (keys %setup) {
-               $::config{$c}=::possibly_foolish_untaint($setup{$c})
+               $config{$c}=possibly_foolish_untaint($setup{$c})
                        if defined $setup{$c} && ! ref $setup{$c};
        }
-       $::config{rebuild}=1;
-       ::refresh();
+       $config{rebuild}=1;
+
+       checkconfig();
+       lockwiki();
+       refresh();
 
-       ::debug("done");
-       ::saveindex();
+       debug("done");
+       saveindex();
 }
 
 1