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 0e091b994134fcce7d3b4d59ffd0504e9712b4f8..9d4732b6f87825c3594f061ec6a41dcee6c8203e 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -10,12 +10,13 @@ use strict;
 use IkiWiki;
 
 sub import { #{{{
 use IkiWiki;
 
 sub import { #{{{

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

 } #}}}
 
 } #}}}
 

-sub dumpline ($$$) { #{{{
+sub dumpline ($$$$) { #{{{

        my $key=shift;
        my $value=shift;
        my $key=shift;
        my $value=shift;

+       my $type=shift;

        my $prefix=shift;
        
        eval q{use Data::Dumper};
        my $prefix=shift;
        
        eval q{use Data::Dumper};


@@ -26,11 +27,33 @@ sub dumpline ($$$) { #{{{
        local $Data::Dumper::Sortkeys=1;
        local $Data::Dumper::Quotekeys=0;
        
        local $Data::Dumper::Sortkeys=1;
        local $Data::Dumper::Quotekeys=0;
        

-       my $dumpedvalue=Dumper($value);
-       chomp $dumpedvalue;
-       $dumpedvalue=~s/^\t//;
+       my $dumpedvalue;
+       if ($type eq 'boolean' || $type eq 'integer') {
+               # avoid quotes
+               $dumpedvalue=$value;
+       }
+       elsif ($type eq 'string' && ref $value eq 'ARRAY' && @$value &&
+           ! grep { /[^-A-Za-z0-9_]/ } @$value) {
+               # dump simple array as qw{}
+               $dumpedvalue="[qw{ ".join(" ", @$value)." }]";
+       }
+       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//;
+               chomp $dumpedvalue;
+       }

        
        

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

 } #}}}
 
 sub dumpvalues ($@) { #{{{
 } #}}}
 
 sub dumpvalues ($@) { #{{{


@@ -39,58 +62,70 @@ sub dumpvalues ($@) { #{{{
        while (@_) {
                my $key=shift;
                my %info=%{shift()};
        while (@_) {
                my $key=shift;
                my %info=%{shift()};

+
+               next if $info{type} eq "internal";

                
                push @ret, "\t# ".$info{description} if exists $info{description};
                
                if (exists $setup->{$key} && defined $setup->{$key}) {
                
                push @ret, "\t# ".$info{description} if exists $info{description};
                
                if (exists $setup->{$key} && defined $setup->{$key}) {

-                       push @ret, dumpline($key, $setup->{$key}, "");
+                       push @ret, dumpline($key, $setup->{$key}, $info{type}, "");

                        delete $setup->{$key};
                }
                        delete $setup->{$key};
                }

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

                elsif (exists $info{example}) {
                elsif (exists $info{example}) {

-                       push @ret, dumpline($key, $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=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());

 
 

-       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}->() };
+               }

        }
        }

-       
-       if (%setup) {
-               push @ret, "\t# other";
-               foreach my $key (sort keys %setup) {
-                       push @ret, dumpline($key, $setup{$key}, "");
+
+       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
-# 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 {";
+       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