X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f7ded1174dd8f4aec3371214bbadc1c1f7fc2e22..11fc28970b329334d88d3667e5b55e0d57e353ab:/ikiwiki-transition

diff --git a/ikiwiki-transition b/ikiwiki-transition
index 7e99c878e..1bebb1176 100755
--- 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