add --refresh and make it with with --setup

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 4a49895da6bd176934ffea7a515499cca50d57ea..b26df006b9d3e1d0ae58249ed4417f0f3c9f3746 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -7,6 +7,7 @@
 use warnings;
 use strict;
 use IkiWiki::Wrapper;
 use warnings;
 use strict;
 use IkiWiki::Wrapper;

+use IkiWiki::Render;

 
 package IkiWiki::Setup::Standard;
 
 
 package IkiWiki::Setup::Standard;
 


@@ -19,22 +20,31 @@ package IkiWiki;
 sub setup_standard {
        my %setup=%{$_[1]};
 
 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();
+       if (! $config{refresh}) {
+               debug("generating wrappers..");
+               my %startconfig=(%config);
+               foreach my $wrapper (@{$setup{wrappers}}) {
+                       %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
+                       checkconfig();
+                       gen_wrapper();
+               }
+               %config=(%startconfig);

        }
        }

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

        foreach my $c (keys %setup) {
                $config{$c}=possibly_foolish_untaint($setup{$c})
                        if defined $setup{$c} && ! ref $setup{$c};
        }
        foreach my $c (keys %setup) {
                $config{$c}=possibly_foolish_untaint($setup{$c})
                        if defined $setup{$c} && ! ref $setup{$c};
        }

-       $config{rebuild}=1;
-       checkoptions();
+       if (! $config{refresh}) {
+               $config{rebuild}=1;
+               debug("rebuilding wiki..");
+       }
+       else {
+               debug("refreshing wiki..");
+       }
+
+       checkconfig();
+       lockwiki();
+       loadindex();

        refresh();
 
        debug("done");
        refresh();
 
        debug("done");