Merge branch 'aggregateinternal'

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

diff --git a/ikiwiki-transition b/ikiwiki-transition
index ce081fe63f63ffe0eb22492148ff8228994fee32..6524297ee6e0fa00749210a5593e70290b3913a4 100755 (executable)
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -99,12 +99,25 @@ sub hashpassword {
        }
 }
 
        }
 }
 

+sub aggregateinternal {
+       $config{srcdir} = shift;
+       $config{wikistatedir} = $config{srcdir}."/.ikiwiki";
+       $config{htmlext} = (shift or "html");
+
+       require IkiWiki::Plugin::aggregate;
+
+       IkiWiki::Plugin::aggregate::migrate_to_internal();
+
+       print "... now add aggregateinternal => 1 to your .setup file\n";
+}
+

 sub usage {
        print STDERR "Usage: ikiwiki-transition type ...\n";
        print STDERR "Currently supported transition subcommands:\n";
        print STDERR "  prefix_directives file\n";
        print STDERR "  indexdb srcdir\n";
        print STDERR "  hashpassword srcdir\n";
 sub usage {
        print STDERR "Usage: ikiwiki-transition type ...\n";
        print STDERR "Currently supported transition subcommands:\n";
        print STDERR "  prefix_directives file\n";
        print STDERR "  indexdb srcdir\n";
        print STDERR "  hashpassword srcdir\n";

+       print STDERR "  aggregateinternal srcdir [htmlext]\n";

        exit 1;
 }
 
        exit 1;
 }
 


@@ -120,6 +133,9 @@ elsif ($mode eq 'hashpassword') {
 elsif ($mode eq 'indexdb') {
        indexdb(@ARGV);
 }
 elsif ($mode eq 'indexdb') {
        indexdb(@ARGV);
 }

+elsif ($mode eq 'aggregateinternal') {
+       aggregateinternal(@ARGV);
+}

 else {
        usage();
 }
 else {
        usage();
 }