improve handling of typoed or problem rcs

1 files changed, 22 insertions, 16 deletions

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index ee83a2fcf..f6eb00f70 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -30,7 +30,7 @@ sub import (@) { #{{{
 	# Sanitize this to avoid problimatic directory names.
 	$config{wikiname}=~s/[^-A-Za-z0-9_] //g;
 	if (! length $config{wikiname}) {
-		die "you must enter a wikiname\n";
+		error gettext("you must enter a wikiname (that contains alphanumerics)");
 	}
 
 	# Avoid overwriting any existing files.
@@ -43,6 +43,26 @@ sub import (@) { #{{{
 		}
 		$config{$key}=$add.$config{$key};
 	}
+	
+	# Set up wrapper
+	if ($config{rcs}) {
+		if ($config{rcs} eq 'git') {
+			$config{git_wrapper}=$config{repository}."/hooks/post-update";
+		}
+		elsif ($config{rcs} eq 'svn') {
+			$config{svn_wrapper}=$config{repository}."/hooks/post-commit";
+		}
+		elsif ($config{rcs} eq 'bzr') {
+			# TODO
+		}
+		elsif ($config{rcs} eq 'mercurial') {
+			# TODO
+		}
+		else {
+			error sprintf(gettext("unsupported revision control system %s"),
+			       	$config{rcs});
+		}
+	}
 
 	IkiWiki::checkconfig();
 
@@ -55,26 +75,12 @@ sub import (@) { #{{{
 		my @params=($config{rcs}, $config{srcdir});
 		push @params, $config{repository} if exists $config{repository};
 		if (system("ikiwiki-makerepo", @params) != 0) {
-			die "failed: ikiwiki-makerepo @params";
+			error gettext("failed to set up the repository with ikiwiki-makerepo");
 		}
 	}
 
 	# Generate setup file.
 	require IkiWiki::Setup;
-	if ($config{rcs}) {
-		if ($config{rcs} eq 'git') {
-			$config{git_wrapper}=$config{repository}."/hooks/post-update";
-		}
-		elsif ($config{rcs} eq 'svn') {
-			$config{svn_wrapper}=$config{repository}."/hooks/post-commit";
-		}
-		elsif ($config{rcs} eq 'bzr') {
-			# TODO
-		}
-		elsif ($config{rcs} eq 'mercurial') {
-			# TODO
-		}
-	}
 	IkiWiki::Setup::dump($config{dumpsetup});
 
 	# Build the wiki, but w/o wrappers, so it's not live yet.