X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0b6dd9247bd442560ab740051f0e60b22bf2dccc..73f4a8835876c8cb07808367cd72d9ae972893e8:/IkiWiki/Setup.pm diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm index 73e32447c..8a25ecc57 100644 --- a/IkiWiki/Setup.pm +++ b/IkiWiki/Setup.pm @@ -8,30 +8,33 @@ use warnings; use strict; use IkiWiki; use open qw{:utf8 :std}; +use File::Spec; -sub load ($) { # {{{ +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, $!)); my $code; { local $/=undef; - $code=; + $code= || error("$setup: $!"); } + ($code)=$code=~/(.*)/s; close IN; eval $code; error("$setup: ".$@) if $@; -} #}}} +} 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}) { @@ -69,17 +72,20 @@ sub merge ($) { 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; + # 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,11 +102,13 @@ sub getsetup () { #{{{ push @ret, [ $plugin, \@s ], } } + + $config{syslog}=$syslog; return @ret; -} #}}} +} -sub dump ($) { #{{{ +sub dump ($) { my $file=IkiWiki::possibly_foolish_untaint(shift); require IkiWiki::Setup::Standard;