web commit by joey

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 7be4f891a30848c394b78217f7bc0b9b2ea640dc..c5a67afdf7cce69f4e1fea08f7dae4b377f14111 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -4,30 +4,45 @@
 # plus hashes for cgiwrapper and svnwrapper, which specify any differing
 # config stuff for them and cause the wrappers to be made.
 
 # 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 warnings;
 use strict;

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

 
 sub import {
 
 sub import {

-       my %setup=%{$_[1]};
+       IkiWiki::setup_standard(@_);
+}
+       
+package IkiWiki;

 
 

+sub setup_standard {
+       my %setup=%{$_[1]};

 
 

-       ::debug("generating wrappers..");
-       foreach my $wrapper (@{$setup{wrapper}}) {
-               ::gen_wrapper(%::config, %setup, %{$wrapper});
+       debug("generating wrappers..");
+       my %startconfig=(%config);
+       foreach my $wrapper (@{$setup{wrappers}}) {
+               %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
+               checkconfig();
+               gen_wrapper();

        }
        }

-
-       ::debug("rebuilding wiki..");
+       %config=(%startconfig);
+       
+       debug("rebuilding wiki..");

        foreach my $c (keys %setup) {
        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};
        }
                        if defined $setup{$c} && ! ref $setup{$c};
        }

-       $::config{rebuild}=1;
-       ::refresh();
+       $config{rebuild}=1;
+
+       checkconfig();
+       lockwiki();
+       loadindex();
+       refresh();

 
 

-       ::debug("done");
-       ::saveindex();
+       debug("done");
+       saveindex();

 }
 
 1
 }
 
 1