checkconfig before wrapper setup
Necessary now that the plugins control what wrappers are built.master
parent
3d139e4312
commit
6040886c72
|
@ -116,6 +116,10 @@ sub main () { #{{{
|
||||||
if ($config{setup}) {
|
if ($config{setup}) {
|
||||||
require IkiWiki::Setup;
|
require IkiWiki::Setup;
|
||||||
IkiWiki::Setup::load($config{setup});
|
IkiWiki::Setup::load($config{setup});
|
||||||
|
|
||||||
|
loadplugins();
|
||||||
|
checkconfig();
|
||||||
|
|
||||||
if (@{$config{wrappers}} &&
|
if (@{$config{wrappers}} &&
|
||||||
! $config{render} && ! $config{dumpsetup} &&
|
! $config{render} && ! $config{dumpsetup} &&
|
||||||
(! $config{refresh} || $config{genwrappers})) {
|
(! $config{refresh} || $config{genwrappers})) {
|
||||||
|
@ -148,9 +152,6 @@ sub main () { #{{{
|
||||||
# ignore syslog setting from setup file
|
# ignore syslog setting from setup file
|
||||||
# while doing initial setup
|
# while doing initial setup
|
||||||
$config{syslog}=0 unless $config{dumpsetup};
|
$config{syslog}=0 unless $config{dumpsetup};
|
||||||
|
|
||||||
loadplugins();
|
|
||||||
checkconfig();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($config{dumpsetup}) {
|
if ($config{dumpsetup}) {
|
||||||
|
|
Loading…
Reference in New Issue