web commit by http://harningt.myopenid.com/: IRC discussion about usage semantics

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index b1418ae34743272c583e35cdbe915026a236c258..87db648e0accc2c177f2f55e8c6dc712863a0326 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -24,28 +24,28 @@ sub setup_standard {
                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};
-       }
        if (exists $setup{exclude}) {
-               $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$setup{exclude}/;
+               push @{$config{wiki_file_prune_regexps}}, $setup{exclude};
        }
 
-       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();
+       if (! $config{render} && (! $config{refresh} || $config{wrappers})) {
+               debug(gettext("generating wrappers.."));
+               my @wrappers=@{$setup{wrappers}};
+               delete $setup{wrappers};
+               my %startconfig=(%config);
+               foreach my $wrapper (@wrappers) {
+                       %config=(%startconfig, rebuild => 0, verbose => 0, %setup, %{$wrapper});
+                       checkconfig();
+                       if (! $config{cgi} && ! $config{post_commit}) {
+                               $config{post_commit}=1;
+                       }
+                       gen_wrapper();
+               }
+               %config=(%startconfig);
        }
-       %config=(%startconfig);
        
        foreach my $c (keys %setup) {
+               next if $c eq 'syslog';
                if (defined $setup{$c}) {
                        if (! ref $setup{$c}) {
                                $config{$c}=possibly_foolish_untaint($setup{$c});
@@ -53,18 +53,26 @@ sub setup_standard {
                        elsif (ref $setup{$c} eq 'ARRAY') {
                                $config{$c}=[map { possibly_foolish_untaint($_) } @{$setup{$c}}]
                        }
+                       elsif (ref $setup{$c} eq 'HASH') {
+                               foreach my $key (keys %{$setup{$c}}) {
+                                       $config{$c}{$key}=possibly_foolish_untaint($setup{$c}{$key});
+                               }
+                       }
                }
                else {
                        $config{$c}=undef;
                }
        }
 
-       if (! $config{refresh}) {
+       if ($config{render}) {
+               commandline_render();
+       }
+       elsif (! $config{refresh}) {
                $config{rebuild}=1;
-               debug("rebuilding wiki..");
+               debug(gettext("rebuilding wiki.."));
        }
        else {
-               debug("refreshing wiki..");
+               debug(gettext("refreshing wiki.."));
        }
 
        loadplugins();
@@ -73,7 +81,7 @@ sub setup_standard {
        loadindex();
        refresh();
 
-       debug("done");
+       debug(gettext("done"));
        saveindex();
 }