X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2df8696b5f234095a89182e53279fb6c61258711..edfe8693814ef48426dc35fa76cdd145871fbc96:/ikiwiki-transition?ds=inline

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;
 }