X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/49d8c5b821743355fa60b30e1b2b456c44aaa221..b5e7f7a67f9893c7083afe3594c4a274c1b96062:/IkiWiki/Setup/Automator.pm

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 9fee4dcb7..2dcb424e5 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -38,19 +38,22 @@ sub sanitize_wikiname ($) {
 
 sub import (@) {
 	my $this=shift;
+	$config{setuptype}='Standard';
 	IkiWiki::Setup::merge({@_});
 
-	# 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++;
+	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
@@ -69,9 +72,15 @@ sub import (@) {
 		}
 		elsif ($config{rcs} eq 'bzr') {
 			# TODO
+			print STDERR "warning: do not know how to set up the bzr_wrapper hook!\n";
 		}
 		elsif ($config{rcs} eq 'mercurial') {
 			# TODO
+			print STDERR "warning: do not know how to set up the mercurial_wrapper hook!\n";
+		}
+		elsif ($config{rcs} eq 'tla') {
+			# TODO
+			print STDERR "warning: do not know how to set up the tla_wrapper hook!\n";
 		}
 		elsif ($config{rcs} eq 'cvs') {
 			$config{cvs_wrapper}=$config{repository}."/CVSROOT/post-commit";
@@ -121,9 +130,10 @@ sub import (@) {
 				IkiWiki::run_hooks(checkconfig => sub { shift->() });
 			};
 			if ($@) {
+				my $err=$@;
 				print STDERR sprintf(gettext("** Disabling plugin %s, since it is failing with this message:"),
 					$plugin)."\n";
-				print STDERR "$@\n";
+				print STDERR "$err\n";
 				push @{$bakconfig{disable_plugins}}, $plugin;
 			}
 		}
@@ -142,7 +152,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);