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

move wrapper building loop into Wrapper.pm

master
Joey Hess 2010-07-24 17:33:59 -04:00
parent a7454c0e32
commit 0aa621a833
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
IkiWiki/Wrapper.pm
View File

@ -8,6 +8,26 @@ use File::Spec;
use Data::Dumper;
use IkiWiki;
sub gen_wrappers () {
debug(gettext("generating wrappers.."));
my %origconfig=(%config);
foreach my $wrapper (@{$config{wrappers}}) {
%config=(%origconfig, %{$wrapper});
$config{verbose}=$config{setupverbose}
if exists $config{setupverbose};
$config{syslog}=$config{setupsyslog}
if exists $config{setupsyslog};
delete @config{qw(setupsyslog setupverbose wrappers genwrappers rebuild)};
checkconfig();
if (! $config{cgi} && ! $config{post_commit} &&
! $config{test_receive}) {
$config{post_commit}=1;
}
gen_wrapper();
}
%config=(%origconfig);
}
sub gen_wrapper () {
$config{srcdir}=File::Spec->rel2abs($config{srcdir});
$config{destdir}=File::Spec->rel2abs($config{destdir});

18
ikiwiki.in
View File

@ -163,24 +163,8 @@ sub main () {
! $config{clean} &&
((! $config{refresh} && ! $config{post_commit})
|| $config{genwrappers})) {
debug(gettext("generating wrappers.."));
require IkiWiki::Wrapper;
my %origconfig=(%config);
foreach my $wrapper (@{$config{wrappers}}) {
%config=(%origconfig, %{$wrapper});
$config{verbose}=$config{setupverbose}
if exists $config{setupverbose};
$config{syslog}=$config{setupsyslog}
if exists $config{setupsyslog};
delete @config{qw(setupsyslog setupverbose wrappers genwrappers rebuild)};
checkconfig();
if (! $config{cgi} && ! $config{post_commit} &&
! $config{test_receive}) {
$config{post_commit}=1;
}
gen_wrapper();
}
%config=(%origconfig);
gen_wrappers();
}
# setup implies a wiki rebuild by default