lose the ugly $rawsetup, use a function
parent
ddef0d3170
commit
3d4c32dace
|
@ -9,12 +9,6 @@ use strict;
|
||||||
use IkiWiki;
|
use IkiWiki;
|
||||||
use open qw{:utf8 :std};
|
use open qw{:utf8 :std};
|
||||||
|
|
||||||
# There can be multiple modules, with different configuration styles.
|
|
||||||
# The setup modules each convert the data into the hashes used by ikiwiki
|
|
||||||
# internally (if it's not already in that format), and store it in
|
|
||||||
# IkiWiki::Setup::$raw_setup, to pass it back to this module.
|
|
||||||
our $raw_setup;
|
|
||||||
|
|
||||||
sub load ($) { # {{{
|
sub load ($) { # {{{
|
||||||
my $setup=IkiWiki::possibly_foolish_untaint(shift);
|
my $setup=IkiWiki::possibly_foolish_untaint(shift);
|
||||||
delete $config{setup};
|
delete $config{setup};
|
||||||
|
@ -31,9 +25,10 @@ sub load ($) { # {{{
|
||||||
|
|
||||||
eval $code;
|
eval $code;
|
||||||
error("$setup: ".$@) if $@;
|
error("$setup: ".$@) if $@;
|
||||||
|
} #}}}
|
||||||
|
|
||||||
my %setup=%{$raw_setup};
|
sub merge ($) {
|
||||||
$raw_setup=undef;
|
my %setup=%{shift()};
|
||||||
|
|
||||||
# Merge setup into existing config and untaint.
|
# Merge setup into existing config and untaint.
|
||||||
if (exists $setup{add_plugins}) {
|
if (exists $setup{add_plugins}) {
|
||||||
|
|
|
@ -10,7 +10,7 @@ use strict;
|
||||||
use IkiWiki;
|
use IkiWiki;
|
||||||
|
|
||||||
sub import { #{{{
|
sub import { #{{{
|
||||||
$IkiWiki::Setup::raw_setup=$_[1];
|
IkiWiki::Setup::merge($_[1]);
|
||||||
} #}}}
|
} #}}}
|
||||||
|
|
||||||
sub dumpline ($$$$) { #{{{
|
sub dumpline ($$$$) { #{{{
|
||||||
|
|
Loading…
Reference in New Issue