X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1e081cf7e404fc403d063d39614e8c9a6583f17f..e96aa16ab959e62c4ce826c599e48a959ebc3e64:/IkiWiki/Setup/Automator.pm?ds=sidebyside

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 742d67666..9da594e99 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -15,6 +15,7 @@ sub ask ($$) {
 	my ($question, $default)=@_;
 
 	my $r=Term::ReadLine->new("ikiwiki");
+	$r->ornaments("md,me");
 	$r->readline(encode_utf8($question)." ", $default);
 }
 
@@ -24,27 +25,34 @@ sub prettydir ($) {
 	return $dir;
 }
 
-sub import (@) {
-	my $this=shift;
-	IkiWiki::Setup::merge({@_});
+sub sanitize_wikiname ($) {
+	my $wikiname=shift;
 
 	# Sanitize this to avoid problimatic directory names.
-	$config{wikiname}=~s/[^-A-Za-z0-9_]//g;
-	if (! length $config{wikiname}) {
+	$wikiname=~s/[^-A-Za-z0-9_]//g;
+	if (! length $wikiname) {
 		error gettext("you must enter a wikiname (that contains alphanumerics)");
 	}
+	return $wikiname;
+}
 
-	# Avoid overwriting any existing files.
-	foreach my $key (qw{srcdir destdir repository dumpsetup}) {
-		next unless exists $config{$key};
-		my $add="";
-		my $dir=IkiWiki::dirname($config{$key})."/";
-		my $base=IkiWiki::basename($config{$key});
-		while (-e $dir.$add.$base) {
-			$add=1 if ! $add;
-			$add++;
+sub import (@) {
+	my $this=shift;
+	IkiWiki::Setup::merge({@_});
+
+	if (! $config{force_overwrite}) {
+		# Avoid overwriting any existing files.
+		foreach my $key (qw{srcdir destdir repository dumpsetup}) {
+			next unless exists $config{$key};
+			my $add="";
+			my $dir=IkiWiki::dirname($config{$key})."/";
+			my $base=IkiWiki::basename($config{$key});
+			while (-e $dir.$add.$base) {
+				$add=1 if ! $add;
+				$add++;
+			}
+			$config{$key}=$dir.$add.$base;
 		}
-		$config{$key}=$dir.$add.$base;
 	}
 	
 	# Set up wrapper
@@ -67,6 +75,9 @@ sub import (@) {
 		elsif ($config{rcs} eq 'mercurial') {
 			# TODO
 		}
+		elsif ($config{rcs} eq 'cvs') {
+			$config{cvs_wrapper}=$config{repository}."/CVSROOT/post-commit";
+		}
 		else {
 			error sprintf(gettext("unsupported revision control system %s"),
 			       	$config{rcs});
@@ -133,7 +144,7 @@ sub import (@) {
 
 	# Create admin user(s).
 	foreach my $admin (@{$config{adminuser}}) {
-		next if $admin=~/^http\?:\/\//; # openid
+		next if defined IkiWiki::openiduser($admin);
 		
 		# Prompt for password w/o echo.
 		my ($password, $password2);