Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / IkiWiki / Setup / Automator.pm

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 202c5541c700c78848f191ee71e73c090490ffc7..88e9f3d245c95a2da545b1899d0d4f2a468dbd93 100644 (file)
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -28,20 +28,45 @@ sub import (@) { #{{{
        IkiWiki::Setup::merge({@_});
 
        # Sanitize this to avoid problimatic directory names.
        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}) {
        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="";
        }
 
        # Avoid overwriting any existing files.
        foreach my $key (qw{srcdir destdir repository dumpsetup}) {
                next unless exists $config{$key};
                my $add="";

-               while (-e $add.$config{$key}) {
+               my $dir=IkiWiki::dirname($config{$key})."/";
+               my $base=IkiWiki::basename($config{$key});
+               while (-e $dir.$add.$base) {

                        $add=1 if ! $add;
                        $add++;
                }
                        $add=1 if ! $add;
                        $add++;
                }

-               $config{$key}=$add.$config{$key};
+               $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();
        }
 
        IkiWiki::checkconfig();


@@ -55,26 +80,12 @@ sub import (@) { #{{{
                my @params=($config{rcs}, $config{srcdir});
                push @params, $config{repository} if exists $config{repository};
                if (system("ikiwiki-makerepo", @params) != 0) {
                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;
                }
        }
 
        # 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.
        IkiWiki::Setup::dump($config{dumpsetup});
 
        # Build the wiki, but w/o wrappers, so it's not live yet.


@@ -110,6 +121,17 @@ sub import (@) { #{{{
                die "ikiwiki --wrappers --setup $config{dumpsetup} failed";
        }
 
                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}) {
        # Done!
        print "\n\nSuccessfully set up $config{wikiname}:\n";
        foreach my $key (qw{url srcdir destdir repository}) {