projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
At Branden's request, clean up the hardcoded ".ikiwiki" everywhere, and add
[ikiwiki.git]
/
IkiWiki
/
Setup
/
Standard.pm
diff --git
a/IkiWiki/Setup/Standard.pm
b/IkiWiki/Setup/Standard.pm
index 68f43b408924ecb173c61f530d3c1250059fc2c7..76213b11aa2636987f3c669ae21379d984e767ff 100644
(file)
--- a/
IkiWiki/Setup/Standard.pm
+++ b/
IkiWiki/Setup/Standard.pm
@@
-14,7
+14,9
@@
sub import {
::debug("generating wrappers..");
foreach my $wrapper (@{$setup{wrappers}}) {
::debug("generating wrappers..");
foreach my $wrapper (@{$setup{wrappers}}) {
- ::gen_wrapper(%::config, verbose => 0, %setup, %{$wrapper});
+ %::config=(%::config, verbose => 0, %setup, %{$wrapper});
+ ::checkoptions();
+ ::gen_wrapper();
}
::debug("rebuilding wiki..");
}
::debug("rebuilding wiki..");
@@
-23,6
+25,7
@@
sub import {
if defined $setup{$c} && ! ref $setup{$c};
}
$::config{rebuild}=1;
if defined $setup{$c} && ! ref $setup{$c};
}
$::config{rebuild}=1;
+ ::checkoptions();
::refresh();
::debug("done");
::refresh();
::debug("done");