Fix admin openid detection in setup automator, and avoid prompting for a password.

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 8a11b2ec6ba366dd49049add8b9ad320d78faaf9..f7a322317f549b9affb08730c53e685710f5930f 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -9,11 +9,11 @@ use warnings;
 use strict;
 use IkiWiki;
 
-sub import { #{{{
+sub import {
        IkiWiki::Setup::merge($_[1]);
-} #}}}
+}
 
-sub dumpline ($$$$) { #{{{
+sub dumpline ($$$$) {
        my $key=shift;
        my $value=shift;
        my $type=shift;
@@ -26,6 +26,8 @@ sub dumpline ($$$$) { #{{{
        local $Data::Dumper::Pad="\t";
        local $Data::Dumper::Sortkeys=1;
        local $Data::Dumper::Quotekeys=0;
+       # only the perl version preserves utf-8 in output
+       local $Data::Dumper::Useperl=1;
        
        my $dumpedvalue;
        if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) {
@@ -53,9 +55,9 @@ sub dumpline ($$$$) { #{{{
        }
        
        return "\t$prefix$key => $dumpedvalue,";
-} #}}}
+}
 
-sub dumpvalues ($@) { #{{{
+sub dumpvalues ($@) {
        my $setup=shift;
        my @ret;
        while (@_) {
@@ -78,20 +80,36 @@ sub dumpvalues ($@) { #{{{
                }
        }
        return @ret;
-} #}}}
+}
 
-sub gendump ($) { #{{{
+sub gendump ($) {
        my $description=shift;
        my %setup=(%config);
        my @ret;
        
        # disable logging to syslog while dumping
-       $config{syslog}=0;
+       $config{syslog}=undef;
 
+       eval q{use Text::Wrap};
+       die $@ if $@;
+
+       my %section_plugins;
        push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
        foreach my $pair (IkiWiki::Setup::getsetup()) {
                my $plugin=$pair->[0];
                my $setup=$pair->[1];
+               my %s=@{$setup};
+               my $section=$s{plugin}->{section};
+               push @{$section_plugins{$section}}, $plugin;
+               if (@{$section_plugins{$section}} == 1) {
+                       push @ret, "", "\t".("#" x 70), "\t# $section plugins",
+                               sub {
+                                       wrap("\t#   (", "\t#    ",
+                                               join(", ", @{$section_plugins{$section}})).")"
+                               },
+                               "\t".("#" x 70);
+               }
+
                my @values=dumpvalues(\%setup, @{$setup});
                if (@values) {
                        push @ret, "", "\t# $plugin plugin", @values;
@@ -109,7 +127,7 @@ sub gendump ($) { #{{{
                "use IkiWiki::Setup::Standard {";
        push @ret, "}";
 
-       return @ret;
-} #}}}
+       return map { ref $_ ? $_->() : $_ } @ret;
+}
 
 1