Revert "quick fix for http://ikiwiki.info/bugs/unwanted_discussion_links_on_discussio...

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

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 42caf3039a9d79fc9686adc206b5b874eb2b3bdf..5111541e48d5865ef056018306a3a23b09d54ba5 100644 (file)
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -58,6 +58,9 @@ sub import (@) {
                elsif ($config{rcs} eq 'monotone') {
                        $config{mtn_wrapper}=$config{srcdir}."_MTN/ikiwiki-netsync-hook";
                }
                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 'bzr') {
                        # TODO
                }


@@ -110,11 +113,21 @@ sub import (@) {
                next if $admin=~/^http\?:\/\//; # openid
                
                # Prompt for password w/o echo.
                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";
                system('stty -echo 2>/dev/null');
                local $|=1;
                print "\n\nCreating wiki admin $admin ...\n";

-               print "Choose a password: ";
-               chomp(my $password=<STDIN>);
+               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";
+               }

                print "\n\n\n";
                system('stty sane 2>/dev/null');
 
                print "\n\n\n";
                system('stty sane 2>/dev/null');