From b29d11b3c67533ca7addadb40a818a88cf6b8a84 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Tue, 15 Jul 2008 03:24:05 +0100
Subject: Fix aggregateinternal migration so it skips expired entries, and
 deletes output

---
 ikiwiki-transition | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'ikiwiki-transition')

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;
 }
 
-- 
cgit v1.2.3