projects
/
ikiwiki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
577477e
)
fix directory uniquification code
author
Joey Hess
<joey@kodama.kitenet.net>
Sat, 23 Aug 2008 01:52:03 +0000
(21:52 -0400)
committer
Joey Hess
<joey@kodama.kitenet.net>
Sat, 23 Aug 2008 01:52:03 +0000
(21:52 -0400)
IkiWiki/Setup/Automator.pm
patch
|
blob
|
history
diff --git
a/IkiWiki/Setup/Automator.pm
b/IkiWiki/Setup/Automator.pm
index 72458376114e05a914b03ca9ec94155f90061c37..88e9f3d245c95a2da545b1899d0d4f2a468dbd93 100644
(file)
--- 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