From 3069c7b36a96cc27a8c5bed8e908bb3774ba8cac Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 22 Aug 2008 21:52:03 -0400
Subject: fix directory uniquification code

---
 IkiWiki/Setup/Automator.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Setup')

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 724583761..88e9f3d24 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -37,11 +37,13 @@ sub import (@) { #{{{
 	foreach my $key (qw{srcdir destdir repository dumpsetup}) {
 		next unless exists $config{$key};
 		my $add="";
-		while (-e $add.$config{$key}) {
+		my $dir=IkiWiki::dirname($config{$key})."/";
+		my $base=IkiWiki::basename($config{$key});
+		while (-e $dir.$add.$base) {
 			$add=1 if ! $add;
 			$add++;
 		}
-		$config{$key}=$add.$config{$key};
+		$config{$key}=$dir.$add.$base;
 	}
 	
 	# Set up wrapper
-- 
cgit v1.2.3