lose the ugly $rawsetup, use a function

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 38b7152029a851d0651943abd6ff772f76e6f364..c2fd59b21479f96bc4d70d68981a36e0edfed593 100644 (file)
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -9,12 +9,6 @@ use strict;
 use IkiWiki;
 use open qw{:utf8 :std};
 
 use IkiWiki;
 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 ($) { # {{{
        my $setup=IkiWiki::possibly_foolish_untaint(shift);
        delete $config{setup};
 sub load ($) { # {{{
        my $setup=IkiWiki::possibly_foolish_untaint(shift);
        delete $config{setup};


@@ -31,9 +25,10 @@ sub load ($) { # {{{
 
        eval $code;
        error("$setup: ".$@) if $@;
 
        eval $code;
        error("$setup: ".$@) if $@;

+} #}}}

 
 

-       my %setup=%{$raw_setup};
-       $raw_setup=undef;
+sub merge ($) {
+       my %setup=%{shift()};

 
        # Merge setup into existing config and untaint.
        if (exists $setup{add_plugins}) {
 
        # Merge setup into existing config and untaint.
        if (exists $setup{add_plugins}) {

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 99da7ed86da91a7c83f7a612113b94a9bccbb1e0..9d8ec38515e5ccb3f5cf280f493cf7495698750b 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -10,7 +10,7 @@ use strict;
 use IkiWiki;
 
 sub import { #{{{
 use IkiWiki;
 
 sub import { #{{{

-       $IkiWiki::Setup::raw_setup=$_[1];
+       IkiWiki::Setup::merge($_[1]);

 } #}}}
 
 sub dumpline ($$$$) { #{{{
 } #}}}
 
 sub dumpline ($$$$) { #{{{