possible answer

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

diff --git a/ikiwiki-transition b/ikiwiki-transition
index ce180730962bada4fa7d8dc08507e54e9550dcc0..1bebb1176d99569341a6735e83c4cb51c14e1ffc 100755 (executable)
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -42,16 +42,8 @@ sub handle_directive {
 }
 
 sub prefix_directives {
-       my $setup=shift;
-       if (! defined $setup) {
-               usage();
-       }
-
-       require IkiWiki::Setup;
-       require IkiWiki::Plugin::aggregate;
+       loadsetup(shift);
 
-       %config = IkiWiki::defaultconfig();
-       IkiWiki::Setup::load($setup);
        IkiWiki::loadplugins();
        IkiWiki::checkconfig();
        IkiWiki::loadindex();
@@ -114,31 +106,16 @@ sub hashpassword {
 }
 
 sub aggregateinternal {
-       my $setup=shift;
-       if (! defined $setup) {
-               usage();
-       }
-
-       require IkiWiki::Setup;
+       loadsetup(shift);
        require IkiWiki::Plugin::aggregate;
-
-       %config = IkiWiki::defaultconfig();
-       IkiWiki::Setup::load($setup);
        IkiWiki::checkconfig();
-
        IkiWiki::Plugin::aggregate::migrate_to_internal();
 }
 
 sub setupformat {
        my $setup=shift;
-       if (! defined $setup) {
-               usage();
-       }
-
-       require IkiWiki::Setup;
 
-       %config = IkiWiki::defaultconfig();
-       IkiWiki::Setup::load($setup);
+       loadsetup($setup);
        IkiWiki::checkconfig();
        
        # unpack old-format wrappers setting into new fields
@@ -175,14 +152,8 @@ sub setupformat {
 
 sub moveprefs {
        my $setup=shift;
-       if (! defined $setup) {
-               usage();
-       }
 
-       require IkiWiki::Setup;
-
-       %config = IkiWiki::defaultconfig();
-       IkiWiki::Setup::load($setup);
+       loadsetup($setup);
        IkiWiki::checkconfig();
 
        eval q{use IkiWiki::UserInfo};
@@ -213,7 +184,9 @@ sub moveprefs {
 }
 
 sub deduplinks {
-       setstatdir(shift);
+       loadsetup(shift);
+       IkiWiki::loadplugins();
+       IkiWiki::checkconfig();
        IkiWiki::loadindex();
        foreach my $page (keys %links) {
                my %l;
@@ -224,22 +197,38 @@ sub deduplinks {
 }
 
 sub setstatedir {
-       my $dir=shift;
+       my $dirorsetup=shift;
 
-       if (! defined $dir) {
+       if (! defined $dirorsetup) {
                usage();                
        }
 
-       if (! -d $dir) {
-               error("ikiwiki-transition: $dir does not exist");
+       if (-d $dirorsetup) {
+               $config{wikistatedir}=$dirorsetup."/.ikiwiki";
+       }
+       elsif (-f $dirorsetup) {
+               loadsetup($dirorsetup);
+       }
+       else {
+               error("ikiwiki-transition: $dirorsetup does not exist");
        }
-
-       $config{wikistatedir}=$dir."/.ikiwiki";
 
        if (! -d $config{wikistatedir}) {
                error("ikiwiki-transition: $config{wikistatedir} does not exist");
        }
 }
+       
+sub loadsetup {
+       my $setup=shift;
+       if (! defined $setup) {
+               usage();
+       }
+
+       require IkiWiki::Setup;
+
+       %config = IkiWiki::defaultconfig();
+       IkiWiki::Setup::load($setup);
+}
 
 sub usage {
        print STDERR "Usage: ikiwiki-transition type ...\n";
@@ -248,9 +237,9 @@ sub usage {
        print STDERR "\taggregateinternal setupfile\n";
        print STDERR "\tsetupformat setupfile\n";
        print STDERR "\tmoveprefs setupfile\n";
-       print STDERR "\thashpassword srcdir\n";
-       print STDERR "\tindexdb srcdir\n";
-       print STDERR "\tdeduplinks srcdir\n";
+       print STDERR "\thashpassword setupfile|srcdir\n";
+       print STDERR "\tindexdb setupfile|srcdir\n";
+       print STDERR "\tdeduplinks setupfile\n";
        exit 1;
 }
 
@@ -310,7 +299,7 @@ sub oldloadindex {
                        $pagemtime{$page}=$items{mtime}[0];
                        $oldlinks{$page}=[@{$items{link}}];
                        $links{$page}=[@{$items{link}}];
-                       $depends{$page}=$items{depends}[0] if exists $items{depends};
+                       $depends{$page}={ $items{depends}[0] => $IkiWiki::DEPEND_CONTENT } if exists $items{depends};
                        $destsources{$_}=$page foreach @{$items{dest}};
                        $renderedfiles{$page}=[@{$items{dest}}];
                        $pagecase{lc $page}=$page;
@@ -346,4 +335,14 @@ sub get_banned_users () {
        return @ret;
 }
 
+# Used to be in IkiWiki, but only used here (to migrate admin prefs into the
+# setup file) now.
+sub pagespec_merge ($$) {
+       my $a=shift;
+       my $b=shift;
+
+       return $a if $a eq $b;
+       return "($a) or ($b)";
+}
+
 1