urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixups

master
Joey Hess 2008-07-26 22:38:43 -04:00
parent 6154dd03cb
commit 67a63e7860
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
IkiWiki/Setup/Standard.pm
View File

@ -83,26 +83,30 @@ sub gendump ($) { #{{{
my %setup=(%config);
my @ret;
# disable logging to syslog while dumping
$config{syslog}=0;
push @ret, "\t# basic setup";
push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
# Load all plugins, so that all setup options are available.
my @plugins=grep { ! /externaldemo|pythondemo/ } sort(IkiWiki::listplugins());
# (But skip a few problematic external demo plugins.)
my @plugins=grep { ! /^(externaldemo|pythondemo|\Q$config{rcs}\E)$/ }
sort(IkiWiki::listplugins());
unshift @plugins, $config{rcs} if $config{rcs}; # rcs plugin 1st
foreach my $plugin (@plugins) {
eval { IkiWiki::loadplugin($plugin) };
if (exists $IkiWiki::hooks{checkconfig}{$plugin}{call}) {
my @s=eval { $IkiWiki::hooks{checkconfig}{$plugin}{call}->() };
}
}
unshift @plugins, $config{rcs} if $config{rcs};
foreach my $id (@plugins) {
my $title="\t# $id".($id ne $config{rcs} ? " plugin" : "");
if (exists $IkiWiki::hooks{getsetup}{$id}{call}) {
# use an array rather than a hash, to preserve order
my @s=eval { $IkiWiki::hooks{getsetup}{$id}{call}->() };
next unless @s;
push @ret, "", $title;
push @ret, "", "\t# $id plugin";
push @ret, dumpvalues(\%setup, @s);
}
}