[Mapbender-commits] r5546 - trunk/mapbender/resources/db

[svn_mapbender at osgeo.org]

Author: tbaschetti
Date: 2010-02-20 06:45:24 -0500 (Sat, 20 Feb 2010)
New Revision: 5546

Modified:
   trunk/mapbender/resources/db/install.bat
Log:
catch empty answer


Modified: trunk/mapbender/resources/db/install.bat
===================================================================
--- trunk/mapbender/resources/db/install.bat	2010-02-20 11:41:49 UTC (rev 5545)
+++ trunk/mapbender/resources/db/install.bat	2010-02-20 11:45:24 UTC (rev 5546)
@@ -33,6 +33,7 @@
 
 echo Continue?
 set /p PREPARED="(y)es or (n)o:"
+if %PREPARED%x==x goto :PREP
 
 if %PREPARED%==y goto :PREP_OK
 if %PREPARED%==n goto :End
@@ -77,13 +78,12 @@
 set DBNAME=%3
 set DBTEMPLATE=%4
 set DBUSER=%5
-
 echo.
+
+REM dbtype and encoding are fixed
 set USEDBTYPE=PostgreSQL
-REM Encoding
 set USEDBENC=UTF-8
 
-
 :CHOICES
 echo.
 echo Your Choices:
@@ -92,6 +92,7 @@
 echo Database Host: %DBHOST%
 echo Database Port: %DBPORT%
 echo Database Name: %DBNAME%
+echo Database Template: %DBTEMPLATE%
 echo Database User: %DBUSER%
 echo.
 echo Looks ok, start install?
@@ -138,7 +139,6 @@
 if not exist ..\..\conf\mapbender.conf copy ..\..\conf\mapbender.conf-dist ..\..\conf\mapbender.conf
 echo please check and edit your mapbender.conf.
 
-
 rem update .po files
 echo ""
 msgfmt --version 2> nul 1> nul
@@ -149,15 +149,13 @@
 call i18n_update_mo.bat
 del i18n_update_mo.bat
 popd
-
-
 goto END:
 
 :MSGFMTNOTFOUND
 echo Sorry, msgfmt not found, must be in PATH-Variable, won't compile translations...
 echo Have a look at http://www.mapbender.org/Gettext#Utility_programms for msgfmt.
 goto END:
-goto END:
+
 :PGNOTFOUND
 echo Sorry, psql not found, must be in PATH-Variable, exiting...
 goto END