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

fork a child to run dumpsetup

master
Joey Hess 2010-07-08 13:55:30 -04:00
parent 8ce11b51f8
commit d4c11466ba
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
IkiWiki/Setup.pm
View File

@ -50,10 +50,8 @@ sub load ($;$) {
sub dump ($) {
my $file=IkiWiki::possibly_foolish_untaint(shift);
eval qq{require IkiWiki::Setup::$config{setuptype}};
error $@ if $@;
my @dump="IkiWiki::Setup::$config{setuptype}"->gendump(
my @header=(
"Setup file for ikiwiki.",
"",
"Passing this to ikiwiki --setup will make ikiwiki generate",
@ -62,9 +60,23 @@ sub dump ($) {
"Remember to re-run ikiwiki --setup any time you edit this file.",
);
open (OUT, ">", $file) || die "$file: $!";
print OUT "$_\n" foreach @dump;
close OUT;
# 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);
open (OUT, ">", $file) || die "$file: $!";
print OUT "$_\n" foreach @dump;
close OUT;
exit 0;
}
else {
waitpid $pid, 0;
exit $? if $?;
}
}
sub merge ($) {