Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 369ff44d094df5cd5efd5757f9a9059d790f03de..7af744f6ab18fe2bc0132891ce7c4fc3a461040f 100644 (file)
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -28,18 +28,19 @@ sub load ($;$) {
        }
        close IN;
 
        }
        close IN;
 

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

                $config{setuptype}=$2;
                if ($1) {
                        error sprintf(gettext("cannot load %s in safe mode"), $file)
                                if $safemode;
                $config{setuptype}=$2;
                if ($1) {
                        error sprintf(gettext("cannot load %s in safe mode"), $file)
                                if $safemode;

+                       no warnings;

                        eval IkiWiki::possibly_foolish_untaint($content);
                        error("$file: ".$@) if $@;
                }
                else {
                        eval IkiWiki::possibly_foolish_untaint($content);
                        error("$file: ".$@) if $@;
                }
                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 {


@@ -49,14 +50,34 @@ sub load ($;$) {
 
 sub dump ($) {
        my $file=IkiWiki::possibly_foolish_untaint(shift);
 
 sub dump ($) {
        my $file=IkiWiki::possibly_foolish_untaint(shift);

+
+       my @header=(
+               "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.",
+       );
+
+       # Fork because dumping setup requires loading all plugins.
+       my $pid=fork();
+       if ($pid == 0) {
+               eval qq{require IkiWiki::Setup::$config{setuptype}};
+               error $@ if $@;
+               my @dump="IkiWiki::Setup::$config{setuptype}"->gendump(@header);

        
        

-       eval qq{require $config{setuptype}};
-       error $@ if $@;
-       my @dump=$config{setuptype}->gendump("Setup file for ikiwiki.");
+               open (OUT, ">", $file) || die "$file: $!";
+               print OUT "$_\n" foreach @dump;
+               close OUT;

 
 

-       open (OUT, ">", $file) || die "$file: $!";
-       print OUT "$_\n" foreach @dump;
-       close OUT;
+               exit 0;
+       }
+       else {
+               waitpid $pid, 0;
+               exit($? >> 8) if $? >> 8;
+               exit(1) if $?;
+       }

 }
 
 sub merge ($) {
 }
 
 sub merge ($) {


@@ -115,7 +136,7 @@ sub getsetup () {
        # Load all plugins, so that all setup options are available.
        my @plugins=IkiWiki::listplugins();
        foreach my $plugin (@plugins) {
        # Load all plugins, so that all setup options are available.
        my @plugins=IkiWiki::listplugins();
        foreach my $plugin (@plugins) {

-               eval { IkiWiki::loadplugin($plugin) };
+               eval { IkiWiki::loadplugin($plugin, 1) };

                if (exists $IkiWiki::hooks{checkconfig}{$plugin}{call}) {
                        my @s=eval { $IkiWiki::hooks{checkconfig}{$plugin}{call}->() };
                }
                if (exists $IkiWiki::hooks{checkconfig}{$plugin}{call}) {
                        my @s=eval { $IkiWiki::hooks{checkconfig}{$plugin}{call}->() };
                }


@@ -159,8 +180,9 @@ sub getsetup () {
                } keys %sections;
 }
 
                } keys %sections;
 }
 

-sub commented_dump ($) {
+sub commented_dump ($$) {

        my $dumpline=shift;
        my $dumpline=shift;

+       my $indent=shift;

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


@@ -172,7 +194,7 @@ sub commented_dump ($) {
        die $@ if $@;
 
        my %section_plugins;
        die $@ if $@;
 
        my %section_plugins;

-       push @ret, commented_dumpvalues($dumpline, \%setup, IkiWiki::getsetup());
+       push @ret, commented_dumpvalues($dumpline, $indent, \%setup, IkiWiki::getsetup());

        foreach my $pair (IkiWiki::Setup::getsetup()) {
                my $plugin=$pair->[0];
                my $setup=$pair->[1];
        foreach my $pair (IkiWiki::Setup::getsetup()) {
                my $plugin=$pair->[0];
                my $setup=$pair->[1];


@@ -180,25 +202,26 @@ sub commented_dump ($) {
                my $section=$s{plugin}->{section};
                push @{$section_plugins{$section}}, $plugin;
                if (@{$section_plugins{$section}} == 1) {
                my $section=$s{plugin}->{section};
                push @{$section_plugins{$section}}, $plugin;
                if (@{$section_plugins{$section}} == 1) {

-                       push @ret, "", "\t".("#" x 70), "\t# $section plugins",
+                       push @ret, "", $indent.("#" x 70), "$indent# $section plugins",

                                sub {
                                sub {

-                                       wrap("\t#   (", "\t#    ",
+                                       wrap("$indent#   (", "$indent#    ",

                                                join(", ", @{$section_plugins{$section}})).")"
                                },
                                                join(", ", @{$section_plugins{$section}})).")"
                                },

-                               "\t".("#" x 70);
+                               $indent.("#" x 70);

                }
 
                }
 

-               my @values=commented_dumpvalues($dumpline, \%setup, @{$setup});
+               my @values=commented_dumpvalues($dumpline, $indent, \%setup, @{$setup});

                if (@values) {
                if (@values) {

-                       push @ret, "", "\t# $plugin plugin", @values;
+                       push @ret, "", "$indent# $plugin plugin", @values;

                }
        }
 
        return map { ref $_ ? $_->() : $_ } @ret;
 }
 
                }
        }
 
        return map { ref $_ ? $_->() : $_ } @ret;
 }
 

-sub commented_dumpvalues ($$@) {
+sub commented_dumpvalues ($$$@) {

        my $dumpline=shift;
        my $dumpline=shift;

+       my $indent=shift;

        my $setup=shift;
        my @ret;
        while (@_) {
        my $setup=shift;
        my @ret;
        while (@_) {


@@ -207,7 +230,7 @@ sub commented_dumpvalues ($$@) {
 
                next if $key eq "plugin" || $info{type} eq "internal";
                
 
                next if $key eq "plugin" || $info{type} eq "internal";
                

-               push @ret, "\t# ".$info{description} if exists $info{description};
+               push @ret, "$indent# ".$info{description} if exists $info{description};

                
                if (exists $setup->{$key} && defined $setup->{$key}) {
                        push @ret, $dumpline->($key, $setup->{$key}, $info{type}, "");
                
                if (exists $setup->{$key} && defined $setup->{$key}) {
                        push @ret, $dumpline->($key, $setup->{$key}, $info{type}, "");