X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/00a427129048f62476ab0386d06e038d222ecd8b..0daa4eb521a32b9ed00e99a2155416a312d478de:/IkiWiki/Setup/Automator.pm

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index f6eb00f70..9f2380d52 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -10,25 +10,25 @@ use IkiWiki::UserInfo;
 use Term::ReadLine;
 use File::Path;
 
-sub ask ($$) { #{{{
+sub ask ($$) {
 	my ($question, $default)=@_;
 
 	my $r=Term::ReadLine->new("ikiwiki");
 	$r->readline($question." ", $default);
-} #}}}
+}
 
-sub prettydir ($) { #{{{
+sub prettydir ($) {
 	my $dir=shift;
 	$dir=~s/^\Q$ENV{HOME}\E\//~\//;
 	return $dir;
-} #}}}
+}
 
-sub import (@) { #{{{
+sub import (@) {
 	my $this=shift;
 	IkiWiki::Setup::merge({@_});
 
 	# Sanitize this to avoid problimatic directory names.
-	$config{wikiname}=~s/[^-A-Za-z0-9_] //g;
+	$config{wikiname}=~s/[^-A-Za-z0-9_]//g;
 	if (! length $config{wikiname}) {
 		error gettext("you must enter a wikiname (that contains alphanumerics)");
 	}
@@ -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
 		}
@@ -137,6 +142,6 @@ sub import (@) { #{{{
 	print "To modify settings, edit ".prettydir($config{dumpsetup})." and then run:\n";
 	print "	ikiwiki -setup ".prettydir($config{dumpsetup})."\n";
 	exit 0;
-} #}}}
+}
 
 1