Setup automator: Prompt for password twice. Closes: #516973

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 42caf3039a9d79fc9686adc206b5b874eb2b3bdf..b63c8e2454fdf683e56f5e9a00c9588ce7b9dfa4 100644 (file)
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -110,11 +110,20 @@ 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 "Confirm password: ";
+                       chomp($password2=<STDIN>);
+
+                       last if  $password2 ne $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');
 

diff --git a/debian/changelog b/debian/changelog
index a650529eb36405c70b3f496203d514aca720baa9..1dc01878b87a6d4d5a33c6c456fb3b670f131fcd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ ikiwiki (3.05) UNRELEASED; urgency=low
   * Add noextension parameter to htmlize hooks to support, eg, Makefile.
   * Add tagged() PageSpec.
   * Updated German translation (Kai Wasserbäch). Closes: #516770
   * Add noextension parameter to htmlize hooks to support, eg, Makefile.
   * Add tagged() PageSpec.
   * Updated German translation (Kai Wasserbäch). Closes: #516770

+  * Setup automator: Prompt for password twice. Closes: #516973

 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Feb 2009 20:11:57 -0500
 
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Feb 2009 20:11:57 -0500
 

diff --git a/po/de.po b/po/de.po
index 1c45c73dc24cbdedc7be67877c0a348476d5d14c..25ec8b5c098f9ffc80f3b114378f81b8e83afe8b 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.04\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.04\n"

-"Report-Msgid-Bugs-To: ikiwiki@packages.debian.org\n"
-"POT-Creation-Date: 2009-02-14 03:04-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-02-24 16:31-0500\n"

 "PO-Revision-Date: 2009-02-20 17:44+0100\n"
 "Last-Translator: Kai Wasserbäch <debian@carbon-project.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "PO-Revision-Date: 2009-02-20 17:44+0100\n"
 "Last-Translator: Kai Wasserbäch <debian@carbon-project.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"


@@ -47,7 +47,7 @@ msgstr "Einstellungen gespeichert."
 msgid "You are banned."
 msgstr "Sie sind ausgeschlossen worden."
 
 msgid "You are banned."
 msgstr "Sie sind ausgeschlossen worden."
 

-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1204
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1209

 msgid "Error"
 msgstr "Fehler"
 
 msgid "Error"
 msgstr "Fehler"
 


@@ -818,16 +818,16 @@ msgstr "Direkter Daten-Download"
 msgid "parse fail at line %d: %s"
 msgstr "Verarbeitungsfehler in Zeile %d: %s"
 
 msgid "parse fail at line %d: %s"
 msgstr "Verarbeitungsfehler in Zeile %d: %s"
 

-#: ../IkiWiki/Plugin/template.pm:28
+#: ../IkiWiki/Plugin/template.pm:29

 msgid "missing id parameter"
 msgstr "fehlender »id«-Parameter"
 
 msgid "missing id parameter"
 msgstr "fehlender »id«-Parameter"
 

-#: ../IkiWiki/Plugin/template.pm:35
+#: ../IkiWiki/Plugin/template.pm:36

 #, perl-format
 msgid "template %s not found"
 msgstr "Vorlage %s nicht gefunden"
 
 #, perl-format
 msgid "template %s not found"
 msgstr "Vorlage %s nicht gefunden"
 

-#: ../IkiWiki/Plugin/template.pm:54
+#: ../IkiWiki/Plugin/template.pm:55

 msgid "failed to process:"
 msgstr "Verarbeitung fehlgeschlagen von:"
 
 msgid "failed to process:"
 msgstr "Verarbeitung fehlgeschlagen von:"
 


@@ -1040,12 +1040,12 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s"
 
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s"
 

-#: ../IkiWiki.pm:1187
+#: ../IkiWiki.pm:1192

 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt"
 
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt"
 

-#: ../IkiWiki.pm:1725
+#: ../IkiWiki.pm:1730

 msgid "yes"
 msgstr "ja"
 
 msgid "yes"
 msgstr "ja"
 

diff --git a/po/es.po b/po/es.po
index 7991ba2d6c4bb743ae2e07c6de9d78a9490c7e4e..e18f146d4f7c758effb9046067d114badc40481b 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2009-02-14 03:04-0500\n"
+"POT-Creation-Date: 2009-02-24 16:31-0500\n"

 "PO-Revision-Date: 2009-02-16 10:22+0100\n"
 "Last-Translator: Víctor Moral <victor@taquiones.net>\n"
 "Language-Team: spanish <es@li.org>\n"
 "PO-Revision-Date: 2009-02-16 10:22+0100\n"
 "Last-Translator: Víctor Moral <victor@taquiones.net>\n"
 "Language-Team: spanish <es@li.org>\n"


@@ -25,7 +25,8 @@ msgstr "Antes es necesario identificarse."
 
 #: ../IkiWiki/CGI.pm:145
 msgid "login failed, perhaps you need to turn on cookies?"
 
 #: ../IkiWiki/CGI.pm:145
 msgid "login failed, perhaps you need to turn on cookies?"

-msgstr "registro fallido, ¿ tal vez necesita activar las cookies en el navegador ?"
+msgstr ""
+"registro fallido, ¿ tal vez necesita activar las cookies en el navegador ?"

 
 #: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:294
 msgid "Your login session has expired."
 
 #: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:294
 msgid "Your login session has expired."


@@ -51,7 +52,7 @@ msgstr "Las preferencias se han guardado."
 msgid "You are banned."
 msgstr "Ha sido expulsado."
 
 msgid "You are banned."
 msgstr "Ha sido expulsado."
 

-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1204
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1209

 msgid "Error"
 msgstr "Error"
 
 msgid "Error"
 msgstr "Error"
 


@@ -61,7 +62,8 @@ msgstr "Contenido añadido activado vía web."
 
 #: ../IkiWiki/Plugin/aggregate.pm:93
 msgid "Nothing to do right now, all feeds are up-to-date!"
 
 #: ../IkiWiki/Plugin/aggregate.pm:93
 msgid "Nothing to do right now, all feeds are up-to-date!"

-msgstr "¡ No hay nada que hacer, todas las fuentes de noticias están actualizadas !"
+msgstr ""
+"¡ No hay nada que hacer, todas las fuentes de noticias están actualizadas !"

 
 #: ../IkiWiki/Plugin/aggregate.pm:220
 #, perl-format
 
 #: ../IkiWiki/Plugin/aggregate.pm:220
 #, perl-format


@@ -350,7 +352,8 @@ msgstr ""
 
 #: ../IkiWiki/Plugin/google.pm:31
 msgid "Failed to parse url, cannot determine domain name"
 
 #: ../IkiWiki/Plugin/google.pm:31
 msgid "Failed to parse url, cannot determine domain name"

-msgstr "Error en el análisis del URL, no puedo determinar el nombre del dominio"
+msgstr ""
+"Error en el análisis del URL, no puedo determinar el nombre del dominio"

 
 #: ../IkiWiki/Plugin/goto.pm:49
 msgid "missing page"
 
 #: ../IkiWiki/Plugin/goto.pm:49
 msgid "missing page"


@@ -441,7 +444,8 @@ msgstr "La página %s está bloqueada y no puede modificarse"
 
 #: ../IkiWiki/Plugin/mdwn.pm:44
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 
 #: ../IkiWiki/Plugin/mdwn.pm:44
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"

-msgstr "el modo multimarkdown está activo, pero no está instalado Text::MultiMarkdown"
+msgstr ""
+"el modo multimarkdown está activo, pero no está instalado Text::MultiMarkdown"

 
 #: ../IkiWiki/Plugin/mdwn.pm:67
 #, perl-format
 
 #: ../IkiWiki/Plugin/mdwn.pm:67
 #, perl-format


@@ -816,16 +820,16 @@ msgstr "Enlace directo para descarga"
 msgid "parse fail at line %d: %s"
 msgstr "error de análisis en la línea %d: %s"
 
 msgid "parse fail at line %d: %s"
 msgstr "error de análisis en la línea %d: %s"
 

-#: ../IkiWiki/Plugin/template.pm:28
+#: ../IkiWiki/Plugin/template.pm:29

 msgid "missing id parameter"
 msgstr "falta el parámetro \"id\""
 
 msgid "missing id parameter"
 msgstr "falta el parámetro \"id\""
 

-#: ../IkiWiki/Plugin/template.pm:35
+#: ../IkiWiki/Plugin/template.pm:36

 #, perl-format
 msgid "template %s not found"
 msgstr "no he encontrado la plantilla %s"
 
 #, perl-format
 msgid "template %s not found"
 msgstr "no he encontrado la plantilla %s"
 

-#: ../IkiWiki/Plugin/template.pm:54
+#: ../IkiWiki/Plugin/template.pm:55

 msgid "failed to process:"
 msgstr "se ha producido un error fatal mientras procesaba la plantilla:"
 
 msgid "failed to process:"
 msgstr "se ha producido un error fatal mientras procesaba la plantilla:"
 


@@ -863,7 +867,8 @@ msgid "plugins"
 msgstr "complementos"
 
 #: ../IkiWiki/Plugin/websetup.pm:395
 msgstr "complementos"
 
 #: ../IkiWiki/Plugin/websetup.pm:395

-msgid "The configuration changes shown below require a wiki rebuild to take effect."
+msgid ""
+"The configuration changes shown below require a wiki rebuild to take effect."

 msgstr ""
 "Los cambios en la configuración que se muestran más abajo precisan una "
 "reconstrucción del wiki para tener efecto."
 msgstr ""
 "Los cambios en la configuración que se muestran más abajo precisan una "
 "reconstrucción del wiki para tener efecto."


@@ -979,7 +984,8 @@ msgstr "el programa %s no parece ser ejecutable"
 
 #: ../IkiWiki/Wrapper.pm:20
 msgid "cannot create a wrapper that uses a setup file"
 
 #: ../IkiWiki/Wrapper.pm:20
 msgid "cannot create a wrapper that uses a setup file"

-msgstr "no puedo crear un programa envoltorio que utiliza un archivo de configuración"
+msgstr ""
+"no puedo crear un programa envoltorio que utiliza un archivo de configuración"

 
 #: ../IkiWiki/Wrapper.pm:24
 msgid "wrapper filename not specified"
 
 #: ../IkiWiki/Wrapper.pm:24
 msgid "wrapper filename not specified"


@@ -1036,14 +1042,14 @@ msgstr "no puedo emplear varios complementos rcs"
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "no he podido cargar el complemento externo %s necesario para %s"
 
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "no he podido cargar el complemento externo %s necesario para %s"
 

-#: ../IkiWiki.pm:1187
+#: ../IkiWiki.pm:1192

 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 "se ha detectado en la página %s un bucle de preprocesado en la iteración "
 "número %i"
 
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 "se ha detectado en la página %s un bucle de preprocesado en la iteración "
 "número %i"
 

-#: ../IkiWiki.pm:1725
+#: ../IkiWiki.pm:1730

 msgid "yes"
 msgstr "si"
 
 msgid "yes"
 msgstr "si"
 


@@ -1068,4 +1074,3 @@ msgstr ""
 #: ../auto.setup:23
 msgid "What is the domain name of the web server?"
 msgstr "¿ Cuál es el dominio para el servidor web ?"
 #: ../auto.setup:23
 msgid "What is the domain name of the web server?"
 msgstr "¿ Cuál es el dominio para el servidor web ?"

-

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index a0fef590c701e8af560c183ca4da5a21259976c2..4ef0c23d17711ca62b900092daac4a0e6e866a35 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2009-02-14 03:04-0500\n"
+"POT-Creation-Date: 2009-02-24 16:31-0500\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -48,7 +48,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
 msgid "You are banned."
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1204
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1209

 msgid "Error"
 msgstr ""
 
 msgid "Error"
 msgstr ""
 


@@ -801,16 +801,16 @@ msgstr ""
 msgid "parse fail at line %d: %s"
 msgstr ""
 
 msgid "parse fail at line %d: %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/template.pm:28
+#: ../IkiWiki/Plugin/template.pm:29

 msgid "missing id parameter"
 msgstr ""
 
 msgid "missing id parameter"
 msgstr ""
 

-#: ../IkiWiki/Plugin/template.pm:35
+#: ../IkiWiki/Plugin/template.pm:36

 #, perl-format
 msgid "template %s not found"
 msgstr ""
 
 #, perl-format
 msgid "template %s not found"
 msgstr ""
 

-#: ../IkiWiki/Plugin/template.pm:54
+#: ../IkiWiki/Plugin/template.pm:55

 msgid "failed to process:"
 msgstr ""
 
 msgid "failed to process:"
 msgstr ""
 


@@ -1012,12 +1012,12 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 

-#: ../IkiWiki.pm:1187
+#: ../IkiWiki.pm:1192

 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 

-#: ../IkiWiki.pm:1725
+#: ../IkiWiki.pm:1730

 msgid "yes"
 msgstr ""
 
 msgid "yes"
 msgstr ""