403 response may be a "not found" too

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

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index f1ed57b4b9f683bbf9f9e6e50756b1163d67b2bd..d1594d7ea4b09d034ef1d8e65d88996cf65e5042 100644 (file)
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -24,15 +24,20 @@ sub prettydir ($) {
        return $dir;
 }
 
-sub import (@) {
-       my $this=shift;
-       IkiWiki::Setup::merge({@_});
+sub sanitize_wikiname ($) {
+       my $wikiname=shift;
 
        # Sanitize this to avoid problimatic directory names.
-       $config{wikiname}=~s/[^-A-Za-z0-9_]//g;
-       if (! length $config{wikiname}) {
+       $wikiname=~s/[^-A-Za-z0-9_]//g;
+       if (! length $wikiname) {
                error gettext("you must enter a wikiname (that contains alphanumerics)");
        }
+       return $wikiname;
+}
+
+sub import (@) {
+       my $this=shift;
+       IkiWiki::Setup::merge({@_});
 
        # Avoid overwriting any existing files.
        foreach my $key (qw{srcdir destdir repository dumpsetup}) {
@@ -59,7 +64,7 @@ sub import (@) {
                        $config{mtn_wrapper}=$config{srcdir}."_MTN/ikiwiki-netsync-hook";
                }
                elsif ($config{rcs} eq 'darcs') {
-                       $config{darcs_wrapper}=$config{repository}."_darcs/ikiwiki-wrapper";
+                       $config{darcs_wrapper}=$config{repository}."/_darcs/ikiwiki-wrapper";
                }
                elsif ($config{rcs} eq 'bzr') {
                        # TODO
@@ -98,6 +103,29 @@ sub import (@) {
                }
        }
 
+       # Make sure that all the listed plugins can load
+       # and checkconfig is ok. If a plugin fails to work,
+       # remove it from the configuration and keep on truckin'.
+       my %bakconfig=%config; # checkconfig can modify %config so back up
+       if (! eval { IkiWiki::loadplugins(); IkiWiki::checkconfig() }) {
+               foreach my $plugin (@{$config{default_plugins}}, @{$bakconfig{add_plugins}}) {
+                       eval {
+                               # delete all hooks so that only this plugins's
+                               # checkconfig will be run
+                               %IkiWiki::hooks=();
+                               IkiWiki::loadplugin($plugin);
+                               IkiWiki::run_hooks(checkconfig => sub { shift->() });
+                       };
+                       if ($@) {
+                               print STDERR sprintf(gettext("** Disabling plugin %s, since it is failing with this message:"),
+                                       $plugin)."\n";
+                               print STDERR "$@\n";
+                               push @{$bakconfig{disable_plugins}}, $plugin;
+                       }
+               }
+       }
+       %config=%bakconfig;
+
        # Generate setup file.
        require IkiWiki::Setup;
        IkiWiki::Setup::dump($config{dumpsetup});
@@ -120,6 +148,7 @@ sub import (@) {
                for (;;) {
                        print "Choose a password: ";
                        chomp($password=<STDIN>);
+                       print "\n";
                        print "Confirm password: ";
                        chomp($password2=<STDIN>);