* Detect invalid pagespecs and do not merge them in add_depends,

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index b7583097daf84851b0ebc43900ae941e79677695..87db648e0accc2c177f2f55e8c6dc712863a0326 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -24,30 +24,28 @@ sub setup_standard {
                push @{$setup{plugin}}, @{$setup{add_plugins}};
                delete $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};
-       }

        if (exists $setup{exclude}) {
        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};

        }
 
        }
 

-       if (! $config{refresh} || $config{wrappers}) {
-               debug("generating wrappers..");
+       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) {
                my @wrappers=@{$setup{wrappers}};
                delete $setup{wrappers};
                my %startconfig=(%config);
                foreach my $wrapper (@wrappers) {

-                       %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
+                       %config=(%startconfig, rebuild => 0, verbose => 0, %setup, %{$wrapper});

                        checkconfig();
                        checkconfig();

+                       if (! $config{cgi} && ! $config{post_commit}) {
+                               $config{post_commit}=1;
+                       }

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


@@ -66,12 +64,15 @@ sub setup_standard {
                }
        }
 
                }
        }
 

-       if (! $config{refresh}) {
+       if ($config{render}) {
+               commandline_render();
+       }
+       elsif (! $config{refresh}) {

                $config{rebuild}=1;
                $config{rebuild}=1;

-               debug("rebuilding wiki..");
+               debug(gettext("rebuilding wiki.."));

        }
        else {
        }
        else {

-               debug("refreshing wiki..");
+               debug(gettext("refreshing wiki.."));

        }
 
        loadplugins();
        }
 
        loadplugins();


@@ -80,7 +81,7 @@ sub setup_standard {
        loadindex();
        refresh();
 
        loadindex();
        refresh();
 

-       debug("done");
+       debug(gettext("done"));

        saveindex();
 }
 
        saveindex();
 }