X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/639f464cb3c703697db2a8887ab32d7a8233508f..f8ad5988da8676bfeff6db9375f2518a12f79a48:/IkiWiki/Setup/Automator.pm

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 42caf3039..d1594d7ea 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -24,15 +24,20 @@ 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;
+}
+
+sub import (@) {
+	my $this=shift;
+	IkiWiki::Setup::merge({@_});
 
 	# Avoid overwriting any existing files.
 	foreach my $key (qw{srcdir destdir repository dumpsetup}) {
@@ -58,6 +63,9 @@ sub import (@) {
 		elsif ($config{rcs} eq 'monotone') {
 			$config{mtn_wrapper}=$config{srcdir}."_MTN/ikiwiki-netsync-hook";
 		}
+		elsif ($config{rcs} eq 'darcs') {
+			$config{darcs_wrapper}=$config{repository}."/_darcs/ikiwiki-wrapper";
+		}
 		elsif ($config{rcs} eq 'bzr') {
 			# TODO
 		}
@@ -95,6 +103,29 @@ sub import (@) {
 		}
 	}
 
+	# Make sure that all the listed plugins can load
+	# and checkconfig is ok. If a plugin fails to work,
+	# remove it from the configuration and keep on truckin'.
+	my %bakconfig=%config; # checkconfig can modify %config so back up
+	if (! eval { IkiWiki::loadplugins(); IkiWiki::checkconfig() }) {
+		foreach my $plugin (@{$config{default_plugins}}, @{$bakconfig{add_plugins}}) {
+			eval {
+				# delete all hooks so that only this plugins's
+				# checkconfig will be run
+				%IkiWiki::hooks=();
+				IkiWiki::loadplugin($plugin);
+				IkiWiki::run_hooks(checkconfig => sub { shift->() });
+			};
+			if ($@) {
+				print STDERR sprintf(gettext("** Disabling plugin %s, since it is failing with this message:"),
+					$plugin)."\n";
+				print STDERR "$@\n";
+				push @{$bakconfig{disable_plugins}}, $plugin;
+			}
+		}
+	}
+	%config=%bakconfig;
+
 	# Generate setup file.
 	require IkiWiki::Setup;
 	IkiWiki::Setup::dump($config{dumpsetup});
@@ -110,11 +141,21 @@ sub import (@) {
 		next if $admin=~/^http\?:\/\//; # openid
 		
 		# Prompt for password w/o echo.
+		my ($password, $password2);
 		system('stty -echo 2>/dev/null');
 		local $|=1;
 		print "\n\nCreating wiki admin $admin ...\n";
-		print "Choose a password: ";
-		chomp(my $password=<STDIN>);
+		for (;;) {
+			print "Choose a password: ";
+			chomp($password=<STDIN>);
+			print "\n";
+			print "Confirm password: ";
+			chomp($password2=<STDIN>);
+
+			last if $password2 eq $password;
+
+			print "Password mismatch.\n\n";
+		}
 		print "\n\n\n";
 		system('stty sane 2>/dev/null');