diff options
author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-26 12:53:07 -0400 |
---|---|---|
committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-26 12:53:07 -0400 |
commit | 255172215e8d886ae875e79694bda1a656053410 (patch) | |
tree | ee4633dddb458846e0c7b55fb21497879d4ae59e | |
parent | ed41d7c70fcbeb6ca626a34a10eb4bbbf9bc4c82 (diff) |
fixes
-rw-r--r-- | IkiWiki/Setup/Standard.pm | 3 | ||||
-rwxr-xr-x | ikiwiki.in | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm index dcb278bf4..0e091b994 100644 --- a/IkiWiki/Setup/Standard.pm +++ b/IkiWiki/Setup/Standard.pm @@ -7,13 +7,12 @@ package IkiWiki::Setup::Standard; use warnings; use strict; +use IkiWiki; sub import { #{{{ $IkiWiki::Setup::raw_setup=$_[1]; } #}}} -package IkiWiki::Setup; - sub dumpline ($$$) { #{{{ my $key=shift; my $value=shift; diff --git a/ikiwiki.in b/ikiwiki.in index 0f82f77ac..8066bbc6e 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -149,9 +149,8 @@ sub main () { #{{{ } if ($config{dumpsetup}) { - loadplugins(); - checkconfig(); - IkiWiki::Setup::dump($config{dumpsetup}); + require IkiWiki::Setup::Standard; + IkiWiki::Setup::Standard::dump($config{dumpsetup}); } elsif ($config{wrapper}) { lockwiki(); |