X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/c755bfd1d88f52a6b4b0e1eef6f2aae0da705fb7..8d5cd865932b0c0feb1a398e5cde31de262a7649:/IkiWiki/Setup/Automator.pm?ds=inline

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index af98c9847..5111541e4 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -6,82 +6,156 @@ package IkiWiki::Setup::Automator;
 use warnings;
 use strict;
 use IkiWiki;
+use IkiWiki::UserInfo;
 use Term::ReadLine;
 use File::Path;
+use Encode;
 
-sub ask ($$) { #{{{
+sub ask ($$) {
 	my ($question, $default)=@_;
 
 	my $r=Term::ReadLine->new("ikiwiki");
-	$r->readline($question." ", $default);
-} #}}}
+	$r->readline(encode_utf8($question)." ", $default);
+}
 
-sub prettydir ($) { #{{{
+sub prettydir ($) {
 	my $dir=shift;
 	$dir=~s/^\Q$ENV{HOME}\E\//~\//;
 	return $dir;
-} #}}}
+}
 
-sub import (@) { #{{{
+sub import (@) {
 	my $this=shift;
 	IkiWiki::Setup::merge({@_});
 
 	# Sanitize this to avoid problimatic directory names.
-	$config{wikiname}=~s/[^-A-Za-z0-9_] //g;
+	$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.
 	foreach my $key (qw{srcdir destdir repository dumpsetup}) {
 		next unless exists $config{$key};
 		my $add="";
-		while (-e $config{$key}.$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}.=$add;
+		$config{$key}=$dir.$add.$base;
+	}
+	
+	# 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 '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
+		}
+		elsif ($config{rcs} eq 'mercurial') {
+			# TODO
+		}
+		else {
+			error sprintf(gettext("unsupported revision control system %s"),
+			       	$config{rcs});
+		}
 	}
 
 	IkiWiki::checkconfig();
 
 	print "\n\nSetting up $config{wikiname} ...\n";
 
-	# Set up the repository.
+	# Set up the srcdir.
 	mkpath($config{srcdir}) || die "mkdir $config{srcdir}: $!";
+	# Copy in example wiki.
+	if (exists $config{example}) {
+		# cp -R is POSIX
+		# Another reason not to use -a is so that pages such as blog
+		# posts will not have old creation dates on this new wiki.
+		system("cp -R $IkiWiki::installdir/share/ikiwiki/examples/$config{example}/* $config{srcdir}");
+		delete $config{example};
+	}
+
+	# Set up the repository.
 	delete $config{repository} if ! $config{rcs} || $config{rcs}=~/bzr|mercurial/;
 	if ($config{rcs}) {
 		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";
+	IkiWiki::Setup::dump($config{dumpsetup});
+
+	# Build the wiki, but w/o wrappers, so it's not live yet.
+	mkpath($config{destdir}) || die "mkdir $config{destdir}: $!";
+	if (system("ikiwiki", "--refresh", "--setup", $config{dumpsetup}) != 0) {
+		die "ikiwiki --refresh --setup $config{dumpsetup} failed";
+	}
+
+	# Create admin user(s).
+	foreach my $admin (@{$config{adminuser}}) {
+		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";
+		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";
 		}
-		elsif ($config{rcs} eq 'bzr') {
-			# TODO
+		print "\n\n\n";
+		system('stty sane 2>/dev/null');
+
+		if (IkiWiki::userinfo_setall($admin, { regdate => time }) &&
+		    IkiWiki::Plugin::passwordauth::setpassword($admin, $password)) {
+			IkiWiki::userinfo_set($admin, "email", $config{adminemail}) if defined $config{adminemail};
 		}
-		elsif ($config{rcs} eq 'mercurial') {
-			# TODO
+		else {
+			error("problem setting up $admin user");
 		}
 	}
-	IkiWiki::Setup::dump($config{dumpsetup});
-
-	# Build the wiki.
-	mkpath($config{destdir}) || die "mkdir $config{destdir}: $!";
-	if (system("ikiwiki", "--setup", $config{dumpsetup}) != 0) {
-		die "ikiwiki --setup $config{dumpsetup} failed";
+	
+	# Add wrappers, make live.
+	if (system("ikiwiki", "--wrappers", "--setup", $config{dumpsetup}) != 0) {
+		die "ikiwiki --wrappers --setup $config{dumpsetup} failed";
 	}
 
+	# Add it to the wikilist.
+	mkpath("$ENV{HOME}/.ikiwiki");
+	open (WIKILIST, ">>$ENV{HOME}/.ikiwiki/wikilist") || die "$ENV{HOME}/.ikiwiki/wikilist: $!";
+	print WIKILIST "$ENV{USER} $config{dumpsetup}\n";
+	close WIKILIST;
+	if (system("ikiwiki-update-wikilist") != 0) {
+		print STDERR "** Failed to add you to the system wikilist file.\n";
+		print STDERR "** (Probably ikiwiki-update-wikilist is not SUID root.)\n";
+		print STDERR "** Your wiki will not be automatically updated when ikiwiki is upgraded.\n";
+	}
+	
 	# Done!
 	print "\n\nSuccessfully set up $config{wikiname}:\n";
 	foreach my $key (qw{url srcdir destdir repository}) {
@@ -92,6 +166,6 @@ sub import (@) { #{{{
 	print "To modify settings, edit ".prettydir($config{dumpsetup})." and then run:\n";
 	print "	ikiwiki -setup ".prettydir($config{dumpsetup})."\n";
 	exit 0;
-} #}}}
+}
 
 1