X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0b6dd9247bd442560ab740051f0e60b22bf2dccc..db7243859de3cc1164066e44c0207f3b83a5dedf:/IkiWiki/Setup.pm?ds=inline diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm index 73e32447c..77afdd608 100644 --- a/IkiWiki/Setup.pm +++ b/IkiWiki/Setup.pm @@ -8,10 +8,12 @@ use warnings; use strict; use IkiWiki; use open qw{:utf8 :std}; +use File::Spec; sub load ($) { # {{{ 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, $!)); @@ -31,7 +33,7 @@ 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}) { @@ -72,14 +74,17 @@ sub merge ($) { } #}}} sub getsetup () { #{{{ - # Gets all available setup data from all plugins. Returns an ordered list of - # [plugin, setup] pairs. + # Gets all available setup data from all plugins. Returns an + # ordered list of [plugin, setup] pairs. 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. - # (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) }; @@ -96,6 +101,8 @@ sub getsetup () { #{{{ push @ret, [ $plugin, \@s ], } } + + $config{syslog}=$syslog; return @ret; } #}}}