Advertise my 'among' branch for review

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

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 73e32447c05c651eead1617ddcaaa39d650ceb96..6ee11209624a20a1a0080852b6f4a64dda756543 100644 (file)
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -8,10 +8,12 @@ use warnings;
 use strict;
 use IkiWiki;
 use open qw{:utf8 :std};
 use strict;
 use IkiWiki;
 use open qw{:utf8 :std};

+use File::Spec;

 
 

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

        my $setup=IkiWiki::possibly_foolish_untaint(shift);
        my $setup=IkiWiki::possibly_foolish_untaint(shift);

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

        #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, $!));
        #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, $!));


@@ -25,13 +27,13 @@ sub load ($) { # {{{
 
        eval $code;
        error("$setup: ".$@) if $@;
 
        eval $code;
        error("$setup: ".$@) if $@;

-} #}}}
+}

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

-       if (exists $setup{add_plugins}) {
+       if (exists $setup{add_plugins} && exists $config{add_plugins}) {

                push @{$setup{add_plugins}}, @{$config{add_plugins}};
        }
        if (exists $setup{exclude}) {
                push @{$setup{add_plugins}}, @{$config{add_plugins}};
        }
        if (exists $setup{exclude}) {


@@ -69,17 +71,20 @@ sub merge ($) {
                        wrappermode => (defined $config{cgi_wrappermode} ? $config{cgi_wrappermode} : "06755"),
                };
        }
                        wrappermode => (defined $config{cgi_wrappermode} ? $config{cgi_wrappermode} : "06755"),
                };
        }

-} #}}}
+}

 
 

-sub getsetup () { #{{{
-       # Gets all available setup data from all plugins. Returns an ordered list of
-       # [plugin, setup] pairs.
+sub getsetup () {
+       # Gets all available setup data from all plugins. Returns an
+       # ordered list of [plugin, setup] pairs.

        my @ret;
 
        my @ret;
 

+        # disable logging to syslog while dumping, broken plugins may
+       # whine when loaded
+       my $syslog=$config{syslog};
+        $config{syslog}=undef;
+

        # Load all plugins, so that all setup options are available.
        # 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());
+       my @plugins=grep { $_ ne $config{rcs} } sort(IkiWiki::listplugins());

        unshift @plugins, $config{rcs} if $config{rcs}; # rcs plugin 1st
        foreach my $plugin (@plugins) {
                eval { IkiWiki::loadplugin($plugin) };
        unshift @plugins, $config{rcs} if $config{rcs}; # rcs plugin 1st
        foreach my $plugin (@plugins) {
                eval { IkiWiki::loadplugin($plugin) };


@@ -96,11 +101,13 @@ sub getsetup () { #{{{
                        push @ret, [ $plugin, \@s ],
                }
        }
                        push @ret, [ $plugin, \@s ],
                }
        }

+       
+        $config{syslog}=$syslog;

 
        return @ret;
 
        return @ret;

-} #}}}
+}

 
 

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

        my $file=IkiWiki::possibly_foolish_untaint(shift);
        
        require IkiWiki::Setup::Standard;
        my $file=IkiWiki::possibly_foolish_untaint(shift);
        
        require IkiWiki::Setup::Standard;