that did the trick

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index ed4331d6143cc5086b6aa02b31144bad86aafa8a..9d4732b6f87825c3594f061ec6a41dcee6c8203e 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -10,7 +10,7 @@ use strict;
 use IkiWiki;
 
 sub import { #{{{
 use IkiWiki;
 
 sub import { #{{{

-       $IkiWiki::Setup::raw_setup=$_[1];
+       IkiWiki::Setup::merge($_[1]);

 } #}}}
 
 sub dumpline ($$$$) { #{{{
 } #}}}
 
 sub dumpline ($$$$) { #{{{


@@ -40,7 +40,17 @@ sub dumpline ($$$$) { #{{{
        else {
                $dumpedvalue=Dumper($value);
                chomp $dumpedvalue;
        else {
                $dumpedvalue=Dumper($value);
                chomp $dumpedvalue;

+               if (length $prefix) {
+                       # add to second and subsequent lines
+                       my @lines=split(/\n/, $dumpedvalue);
+                       $dumpedvalue="";
+                       for (my $x=0; $x <= $#lines; $x++) {
+                               $lines[$x] =~ s/^\t//;
+                               $dumpedvalue.="\t".($x ? $prefix : "").$lines[$x]."\n";
+                       }
+               }

                $dumpedvalue=~s/^\t//;
                $dumpedvalue=~s/^\t//;

+               chomp $dumpedvalue;

        }
        
        return "\t$prefix$key => $dumpedvalue,";
        }
        
        return "\t$prefix$key => $dumpedvalue,";


@@ -61,48 +71,61 @@ sub dumpvalues ($@) { #{{{
                        push @ret, dumpline($key, $setup->{$key}, $info{type}, "");
                        delete $setup->{$key};
                }
                        push @ret, dumpline($key, $setup->{$key}, $info{type}, "");
                        delete $setup->{$key};
                }

-               elsif (exists $info{default} && defined $info{default}) {
-                       push @ret, dumpline($key, $info{default}, $info{type}, "#");
-               }

                elsif (exists $info{example}) {
                        push @ret, dumpline($key, $info{example}, $info{type}, "#");
                }
                elsif (exists $info{example}) {
                        push @ret, dumpline($key, $info{example}, $info{type}, "#");
                }

+               else {
+                       push @ret, dumpline($key, "", $info{type}, "#");
+               }

        }
        return @ret;
 } #}}}
 
        }
        return @ret;
 } #}}}
 

-sub dump ($) { #{{{
-       my $file=IkiWiki::possibly_foolish_untaint(shift);
-       
+sub gendump ($) { #{{{
+       my $description=shift;

        my %setup=(%config);
        my @ret;
        
        my %setup=(%config);
        my @ret;
        

+       # disable logging to syslog while dumping
+       $config{syslog}=0;
+

        push @ret, "\t# basic setup";
        push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
        push @ret, "\t# basic setup";
        push @ret, dumpvalues(\%setup, IkiWiki::getsetup());

-       push @ret, "";

 
 

-       foreach my $id (sort keys %{$IkiWiki::hooks{getsetup}}) {
-               # use an array rather than a hash, to preserve order
-               my @s=$IkiWiki::hooks{getsetup}{$id}{call}->();
-               return unless @s;
-               push @ret, "\t# $id plugin";
-               push @ret, dumpvalues(\%setup, @s);
-               push @ret, "";
+       # Load all plugins, so that all setup options are available.
+       # (But skip a few problematic external demo plugins.)
+       my @plugins=grep { ! /^(externaldemo|pythondemo|\Q$config{rcs}\E)$/ }
+               sort(IkiWiki::listplugins());
+       unshift @plugins, $config{rcs} if $config{rcs}; # rcs plugin 1st
+       foreach my $plugin (@plugins) {
+               eval { IkiWiki::loadplugin($plugin) };
+               if (exists $IkiWiki::hooks{checkconfig}{$plugin}{call}) {
+                       my @s=eval { $IkiWiki::hooks{checkconfig}{$plugin}{call}->() };
+               }

        }
        }

-       
-       unshift @ret, "#!/usr/bin/perl
-# Setup file for ikiwiki.
-# Passing this to ikiwiki --setup will make ikiwiki generate wrappers and
-# build the wiki.
-#
-# Remember to re-run ikiwiki --setup any time you edit this file.

 
 

-use IkiWiki::Setup::Standard {";
+       foreach my $id (@plugins) {
+               if (exists $IkiWiki::hooks{getsetup}{$id}{call}) {
+                       # use an array rather than a hash, to preserve order
+                       my @s=eval { $IkiWiki::hooks{getsetup}{$id}{call}->() };
+                       next unless @s;
+                       push @ret, "", "\t# $id plugin";
+                       push @ret, dumpvalues(\%setup, @s);
+               }
+       }
+       
+       unshift @ret,
+               "#!/usr/bin/perl",
+               "# $description",
+               "#",
+               "# Passing this to ikiwiki --setup will make ikiwiki generate",
+               "# wrappers and build the wiki.",
+               "#",
+               "# Remember to re-run ikiwiki --setup any time you edit this file.",
+               "use IkiWiki::Setup::Standard {";

        push @ret, "}";
 
        push @ret, "}";
 

-       open (OUT, ">", $file) || die "$file: $!";
-       print OUT "$_\n" foreach @ret;
-       close OUT;
+       return @ret;

 } #}}}
 
 1
 } #}}}
 
 1