[Mapbender-commits] r4320 - branches/2.6/resources/db

[svn_mapbender at osgeo.org]

Author: tbaschetti
Date: 2009-07-08 10:35:25 -0400 (Wed, 08 Jul 2009)
New Revision: 4320

Modified:
   branches/2.6/resources/db/install_2.6.bat
   branches/2.6/resources/db/install_2.6.sh
Log:
installscript preserves existing mapbender.conf


Modified: branches/2.6/resources/db/install_2.6.bat
===================================================================
--- branches/2.6/resources/db/install_2.6.bat	2009-07-07 19:44:47 UTC (rev 4319)
+++ branches/2.6/resources/db/install_2.6.bat	2009-07-08 14:35:25 UTC (rev 4320)
@@ -135,7 +135,7 @@
 psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.6rc1_to_2.6rc2_pgsql_%USEDBENC%.sql %DBNAME% 1>>log_update.txt 2>> err_update.txt
 
 
-goto END
+goto POFILES
 
 :INSTMYSQL
 # Update to 2.6 is missing...
@@ -160,19 +160,28 @@
 mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%USEDBENC%/update/update_2.5.1rc1_to_2.5.1_mysql_%USEDBENC%.sql >> log_update.txt 2>> err_update.txt
 rem echo update to 2.6
 rem mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%USEDBENC%/update/update_2.5.1_to_2.6rc1_mysql_%USEDBENC%.sql >> log_update.txt 2>> err_update.txt
+
+GOTO POFILES
+
+
+:POFILES
+rem install mapbender.conf
+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
 if NOT %ERRORLEVEL% == 0 goto MSGFMTNOTFOUND
 echo "Compiling .po files..."
-pushd ../../tools/
+pushd ..\..\tools\
 findstr /v ^# i18n_update_mo.sh > i18n_update_mo.bat
 call i18n_update_mo.bat
 del i18n_update_mo.bat
-popd
+popd
+
+
 goto END:
 
 :MSGFMTNOTFOUND

Modified: branches/2.6/resources/db/install_2.6.sh
===================================================================
--- branches/2.6/resources/db/install_2.6.sh	2009-07-07 19:44:47 UTC (rev 4319)
+++ branches/2.6/resources/db/install_2.6.sh	2009-07-08 14:35:25 UTC (rev 4320)
@@ -199,7 +199,14 @@
           echo "setting execute rights on mapbender/tools/i18n_update_mo.sh"
           chmod -R o+rx ../../tools/i18n_update_mo.sh
           # creating mapbender.conf
-          cp ../../conf/mapbender.conf-dist ../../conf/mapbender.conf
+          if [ -f ../../conf/mapbender.conf ]
+          then
+            echo "mapbender.conf already exists, not changed"
+          else
+            cp ../../conf/mapbender.conf-dist ../../conf/mapbender.conf
+          fi
+          echo ""
+          echo "please check and edit the entries in your mapbender.conf manually!"
           
     fi
 }