clearing up a bit of confusion about who I am

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

diff --git a/ikiwiki-transition b/ikiwiki-transition
index 7e99c878e64b753a9484dc072d426a0f64940334..1bebb1176d99569341a6735e83c4cb51c14e1ffc 100755 (executable)
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -184,7 +184,9 @@ sub moveprefs {
 }
 
 sub deduplinks {
-       setstatdir(shift);
+       loadsetup(shift);
+       IkiWiki::loadplugins();
+       IkiWiki::checkconfig();
        IkiWiki::loadindex();
        foreach my $page (keys %links) {
                my %l;
@@ -237,7 +239,7 @@ sub usage {
        print STDERR "\tmoveprefs setupfile\n";
        print STDERR "\thashpassword setupfile|srcdir\n";
        print STDERR "\tindexdb setupfile|srcdir\n";
-       print STDERR "\tdeduplinks setupfile|srcdir\n";
+       print STDERR "\tdeduplinks setupfile\n";
        exit 1;
 }
 
@@ -297,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;
@@ -333,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