summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-08-22 21:52:03 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-08-22 21:52:03 -0400
commit3069c7b36a96cc27a8c5bed8e908bb3774ba8cac (patch)
tree2cb28e1e6b076b52b9fdb58b0d4af99a97d19133
parent577477e1ce94d6a9626a0db3ba700c0d971c704c (diff)
fix directory uniquification code
-rw-r--r--IkiWiki/Setup/Automator.pm6
1 files changed, 4 insertions, 2 deletions
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