X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/aea5bf9b40f6676e93f987c28d9f2aa23608f5da..71b8827051bf3499d00d9a7e038ce9d33cedb446:/IkiWiki/Setup/Automator.pm?ds=sidebyside

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 9f694e18e..a8b04d966 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -38,8 +38,8 @@ sub sanitize_wikiname ($) {
 
 sub import (@) {
 	my $this=shift;
+	$config{setuptype}='Yaml';
 	IkiWiki::Setup::merge({@_});
-	$config{setuptype}='Standard';
 
 	if (! $config{force_overwrite}) {
 		# Avoid overwriting any existing files.
@@ -72,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";
@@ -124,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;
 			}
 		}
@@ -199,7 +206,7 @@ sub import (@) {
 			prettydir($config{$key})."\n";
 	}
 	print "To modify settings, edit ".prettydir($config{dumpsetup})." and then run:\n";
-	print "	ikiwiki -setup ".prettydir($config{dumpsetup})."\n";
+	print "	ikiwiki --setup ".prettydir($config{dumpsetup})."\n";
 	exit 0;
 }