aboutsummaryrefslogtreecommitdiff
path: root/ikiwiki-transition
diff options
context:
space:
mode:
authorSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>2008-07-15 03:24:05 +0100
committerSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>2008-07-15 03:24:05 +0100
commitb29d11b3c67533ca7addadb40a818a88cf6b8a84 (patch)
treeab632ee5678e82d18d14b805384f0b1b108d9942 /ikiwiki-transition
parentd3008b626ea6130d3b75662725f6f2c412fc71ea (diff)
downloadikiwiki-b29d11b3c67533ca7addadb40a818a88cf6b8a84.tar
ikiwiki-b29d11b3c67533ca7addadb40a818a88cf6b8a84.tar.gz
Fix aggregateinternal migration so it skips expired entries, and deletes output
Diffstat (limited to 'ikiwiki-transition')
-rwxr-xr-xikiwiki-transition10
1 files changed, 5 insertions, 5 deletions
diff --git a/ikiwiki-transition b/ikiwiki-transition
index 6524297ee..3e2c89bf9 100755
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -100,12 +100,12 @@ sub hashpassword {
}
sub aggregateinternal {
- $config{srcdir} = shift;
- $config{wikistatedir} = $config{srcdir}."/.ikiwiki";
- $config{htmlext} = (shift or "html");
-
+ require IkiWiki::Setup;
require IkiWiki::Plugin::aggregate;
+ %config = (IkiWiki::defaultconfig(), IkiWiki::Setup::load(shift));
+ IkiWiki::checkconfig();
+
IkiWiki::Plugin::aggregate::migrate_to_internal();
print "... now add aggregateinternal => 1 to your .setup file\n";
@@ -117,7 +117,7 @@ sub usage {
print STDERR " prefix_directives file\n";
print STDERR " indexdb srcdir\n";
print STDERR " hashpassword srcdir\n";
- print STDERR " aggregateinternal srcdir [htmlext]\n";
+ print STDERR " aggregateinternal setupfile\n";
exit 1;
}