standardising and documenting getsetup

[git.ikiwiki.info.git] / ikiwiki-transition

diff --git a/ikiwiki-transition b/ikiwiki-transition
index 6524297ee6e0fa00749210a5593e70290b3913a4..3e2c89bf9d0166d2a1b29d56541b4b8c272d75d7 100755 (executable)
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -100,12 +100,12 @@ sub hashpassword {
 }
 
 sub aggregateinternal {
 }
 
 sub aggregateinternal {

-       $config{srcdir} = shift;
-       $config{wikistatedir} = $config{srcdir}."/.ikiwiki";
-       $config{htmlext} = (shift or "html");
-
+       require IkiWiki::Setup;

        require IkiWiki::Plugin::aggregate;
 
        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";
        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 "  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;
 }
 
        exit 1;
 }