Removed redundant "configure'

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

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 3accf35919cb13c7123eb9d4c4ce254e75beaa39..ee5be95d2a1cdd2a6a07b8174120e9961755c037 100644 (file)
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -13,40 +13,60 @@ use open qw{:utf8 :std};
 use File::Spec;
 
 sub load ($;$) {
 use File::Spec;
 
 sub load ($;$) {

-       my $setup=IkiWiki::possibly_foolish_untaint(shift);
+       my $file=IkiWiki::possibly_foolish_untaint(shift);

        my $safemode=shift;
 
        my $safemode=shift;
 

-       $config{setupfile}=File::Spec->rel2abs($setup);
+       $config{setupfile}=File::Spec->rel2abs($file);

 
        #translators: The first parameter is a filename, and the second
        #translators: is a (probably not translated) error message.
 
        #translators: The first parameter is a filename, and the second
        #translators: is a (probably not translated) error message.

-       open (IN, $setup) || error(sprintf(gettext("cannot read %s: %s"), $setup, $!));
+       open (IN, $file) || error(sprintf(gettext("cannot read %s: %s"), $file, $!));

        my $content;
        {
                local $/=undef;
        my $content;
        {
                local $/=undef;

-               $content=<IN> || error("$setup: $!");
+               $content=<IN> || error("$file: $!");

        }
        close IN;
 
        }
        close IN;
 

-       if ($content=~/(use\s+)?(IkiWiki::Setup::\w+)/) {
+       if ($content=~/((?:use|require)\s+)?IkiWiki::Setup::(\w+)/) {

                $config{setuptype}=$2;
                if ($1) {
                $config{setuptype}=$2;
                if ($1) {

-                       error sprintf(gettext("cannot load %s in safe mode"), $setup)
+                       error sprintf(gettext("cannot load %s in safe mode"), $file)

                                if $safemode;
                                if $safemode;

+                       no warnings;

                        eval IkiWiki::possibly_foolish_untaint($content);
                        eval IkiWiki::possibly_foolish_untaint($content);

-                       error("$setup: ".$@) if $@;
+                       error("$file: ".$@) if $@;

                }
                else {
                }
                else {

-                       eval qq{require $config{setuptype}};
+                       eval qq{require IkiWiki::Setup::$config{setuptype}};

                        error $@ if $@;
                        error $@ if $@;

-                       $config{setuptype}->loaddump(IkiWiki::possibly_foolish_untaint($content));
+                       "IkiWiki::Setup::$config{setuptype}"->loaddump(IkiWiki::possibly_foolish_untaint($content));

                }
        }
        else {
                }
        }
        else {

-               error sprintf(gettext("failed to parse %s"), $setup);
+               error sprintf(gettext("failed to parse %s"), $file);

        }
 }
 
        }
 }
 

+sub dump ($) {
+       my $file=IkiWiki::possibly_foolish_untaint(shift);
+       
+       eval qq{require IkiWiki::Setup::$config{setuptype}};
+       error $@ if $@;
+       my @dump="IkiWiki::Setup::$config{setuptype}"->gendump(
+               "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.",
+       );
+
+       open (OUT, ">", $file) || die "$file: $!";
+       print OUT "$_\n" foreach @dump;
+       close OUT;
+}
+

 sub merge ($) {
        # Merge setup into existing config and untaint.
        my %setup=%{shift()};
 sub merge ($) {
        # Merge setup into existing config and untaint.
        my %setup=%{shift()};


@@ -147,16 +167,70 @@ sub getsetup () {
                } keys %sections;
 }
 
                } keys %sections;
 }
 

-sub dump ($) {
-       my $file=IkiWiki::possibly_foolish_untaint(shift);
+sub commented_dump ($$) {
+       my $dumpline=shift;
+       my $indent=shift;
+
+       my %setup=(%config);
+       my @ret;

        
        

-       eval qq{require $config{setuptype}};
-       error $@ if $@;
-       my @dump=$config{setuptype}->gendump("Setup file for ikiwiki.");
+       # disable logging to syslog while dumping
+       $config{syslog}=undef;
+
+       eval q{use Text::Wrap};
+       die $@ if $@;
+
+       my %section_plugins;
+       push @ret, commented_dumpvalues($dumpline, $indent, \%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, "", $indent.("#" x 70), "$indent# $section plugins",
+                               sub {
+                                       wrap("$indent#   (", "$indent#    ",
+                                               join(", ", @{$section_plugins{$section}})).")"
+                               },
+                               $indent.("#" x 70);
+               }

 
 

-       open (OUT, ">", $file) || die "$file: $!";
-       print OUT "$_\n" foreach @dump;
-       close OUT;
+               my @values=commented_dumpvalues($dumpline, $indent, \%setup, @{$setup});
+               if (@values) {
+                       push @ret, "", "$indent# $plugin plugin", @values;
+               }
+       }
+
+       return map { ref $_ ? $_->() : $_ } @ret;
+}
+
+sub commented_dumpvalues ($$$@) {
+       my $dumpline=shift;
+       my $indent=shift;
+       my $setup=shift;
+       my @ret;
+       while (@_) {
+               my $key=shift;
+               my %info=%{shift()};
+
+               next if $key eq "plugin" || $info{type} eq "internal";
+               
+               push @ret, "$indent# ".$info{description} if exists $info{description};
+               
+               if (exists $setup->{$key} && defined $setup->{$key}) {
+                       push @ret, $dumpline->($key, $setup->{$key}, $info{type}, "");
+                       delete $setup->{$key};
+               }
+               elsif (exists $info{example}) {
+                       push @ret, $dumpline->($key, $info{example}, $info{type}, "#");
+               }
+               else {
+                       push @ret, $dumpline->($key, "", $info{type}, "#");
+               }
+       }
+       return @ret;

 }
 
 1
 }
 
 1