]> sipb.mit.edu Git - ikiwiki.git/blobdiff - IkiWiki/Setup/Automator.pm
make sure value is defined before using it as an array
[ikiwiki.git] / IkiWiki / Setup / Automator.pm
index af98c9847234f45fa9caf641914a8e65713117df..9f2380d52e0eb1a48bfd218b23c0cd0e94e2e9f2 100644 (file)
@@ -6,41 +6,67 @@ package IkiWiki::Setup::Automator;
 use warnings;
 use strict;
 use IkiWiki;
+use IkiWiki::UserInfo;
 use Term::ReadLine;
 use File::Path;
 
-sub ask ($$) { #{{{
+sub ask ($$) {
        my ($question, $default)=@_;
 
        my $r=Term::ReadLine->new("ikiwiki");
        $r->readline($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 'bzr') {
+                       # TODO
+               }
+               elsif ($config{rcs} eq 'mercurial') {
+                       # TODO
+               }
+               else {
+                       error sprintf(gettext("unsupported revision control system %s"),
+                               $config{rcs});
+               }
        }
 
        IkiWiki::checkconfig();
@@ -54,34 +80,58 @@ 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.
+       # Build the wiki, but w/o wrappers, so it's not live yet.
        mkpath($config{destdir}) || die "mkdir $config{destdir}: $!";
-       if (system("ikiwiki", "--setup", $config{dumpsetup}) != 0) {
-               die "ikiwiki --setup $config{dumpsetup} failed";
+       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.
+               system('stty -echo 2>/dev/null');
+               local $|=1;
+               print "\n\nCreating wiki admin $admin ...\n";
+               print "Choose a password: ";
+               chomp(my $password=<STDIN>);
+               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};
+               }
+               else {
+                       error("problem setting up $admin user");
+               }
+       }
+       
+       # 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 +142,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