X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/6cf96b581974b3e59af3289196c4687c2416f35c..56e18bc00900debc2c3f457d013f366f4d3dea98:/IkiWiki/Setup/Automator.pm diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm index a54b53817..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 @@ -52,6 +54,9 @@ sub import (@) { #{{{ elsif ($config{rcs} eq 'svn') { $config{svn_wrapper}=$config{repository}."/hooks/post-commit"; } + elsif ($config{rcs} eq 'monotone') { + $config{mtn_wrapper}=$config{srcdir}."_MTN/ikiwiki-netsync-hook"; + } elsif ($config{rcs} eq 'bzr') { # TODO }