[Mapbender-commits] r4237 - branches/2.6/resources/db
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Thu Jun 25 10:51:45 EDT 2009
Author: tbaschetti
Date: 2009-06-25 10:51:45 -0400 (Thu, 25 Jun 2009)
New Revision: 4237
Modified:
branches/2.6/resources/db/install_2.6.sh
Log:
log errors in different files
changed test on dbtemplate
added some messages
Modified: branches/2.6/resources/db/install_2.6.sh
===================================================================
--- branches/2.6/resources/db/install_2.6.sh 2009-06-25 13:55:40 UTC (rev 4236)
+++ branches/2.6/resources/db/install_2.6.sh 2009-06-25 14:51:45 UTC (rev 4237)
@@ -2,6 +2,7 @@
#
rm log_*.txt
+rm err_*.txt
# Disclaimer
echo ""
@@ -78,11 +79,11 @@
echo ""
mysql -e "create database $dbname CHARACTER SET latin1 COLLATE latin1_german1_ci;" -p$password
- mysql $dbname -p$password < mysql/mysql_schema_2.5.sql > log_schema.txt
- mysql $dbname -p$password < mysql/ISO-8859-1/mysql_data_2.5.sql > log_data.txt
- mysql $dbname -p$password < mysql/ISO-8859-1/update/update_2.5_to_2.5.1rc1_mysql_ISO-8859-1.sql > log_update.txt
- mysql $dbname -p$password < mysql/ISO-8859-1/update/update_2.5.1rc1_to_2.5.1_mysql_ISO-8859-1.sql > log_update.txt
- mysql $dbname -p$password < mysql/ISO-8859-1/update/update_2.5.1_to_2.6rc1_mysql_ISO-8859-1.sql > log_update.txt
+ mysql $dbname -p$password < mysql/mysql_schema_2.5.sql > log_schema.txt 2> err_schema.txt
+ mysql $dbname -p$password < mysql/ISO-8859-1/mysql_data_2.5.sql > log_data.txt 2> err_data.txt
+ mysql $dbname -p$password < mysql/ISO-8859-1/update/update_2.5_to_2.5.1rc1_mysql_ISO-8859-1.sql > log_update.txt 2> err_update.txt
+ mysql $dbname -p$password < mysql/ISO-8859-1/update/update_2.5.1rc1_to_2.5.1_mysql_ISO-8859-1.sql >> log_update.txt 2>> err_update.txt
+ mysql $dbname -p$password < mysql/ISO-8859-1/update/update_2.5.1_to_2.6rc1_mysql_ISO-8859-1.sql >> log_update.txt 2>> err_update.txt
elif test $dbenc = "u"
then
@@ -91,11 +92,11 @@
echo ""
mysql -e "create database $dbname CHARACTER SET utf8 COLLATE utf8_general_ci;" -p$password
- mysql $dbname -p$password < mysql/mysql_schema_2.5.sql > log_schema.txt
- mysql $dbname -p$password < mysql/UTF-8/mysql_data_2.5.sql > log_data.txt
- mysql $dbname -p$password < mysql/UTF-8/update/update_2.5_to_2.5.1rc1_mysql_UTF-8.sql > log_update.txt
- mysql $dbname -p$password < mysql/UTF-8/update/update_2.5.1rc1_to_2.5.1_mysql_UTF-8.sql > log_update.txt
- mysql $dbname -p$password < mysql/UTF-8/update/update_2.5.1_to_2.6rc1_mysql_UTF-8.sql > log_update.txt
+ mysql $dbname -p$password < mysql/mysql_schema_2.5.sql > log_schema.txt 2> err_schema.txt
+ mysql $dbname -p$password < mysql/UTF-8/mysql_data_2.5.sql > log_data.txt 2> err_data.txt
+ mysql $dbname -p$password < mysql/UTF-8/update/update_2.5_to_2.5.1rc1_mysql_UTF-8.sql > log_update.txt 2> err_update.txt
+ mysql $dbname -p$password < mysql/UTF-8/update/update_2.5.1rc1_to_2.5.1_mysql_UTF-8.sql >> log_update.txt 2>> err_update.txt
+ mysql $dbname -p$password < mysql/UTF-8/update/update_2.5.1_to_2.6rc1_mysql_UTF-8.sql >> log_update.txt 2>> err_update.txt
fi
elif test $dbversion = "p" -a $dbenc = "i"
then
@@ -127,19 +128,19 @@
read dbtemplate
fi
- if test dbtemplate != ""
+ if test -n "$dbtemplate"
then
createdb -U $dbuser -E ISO-8859-1 $dbname -T $dbtemplate
else
createdb -U $dbuser -E ISO-8859-1 $dbname
fi
- psql -U $dbuser -f pgsql/pgsql_schema_2.5.sql $dbname > log_schema.txt
- psql -U $dbuser -f pgsql/ISO-8859-1/pgsql_data_2.5.sql $dbname > log_data.txt
- psql -U $dbuser -f pgsql/pgsql_serial_set_sequences_2.5.sql $dbname > log_sequences.txt
- psql -U $dbuser -f pgsql/ISO-8859-1/update/update_2.5_to_2.5.1rc1_pgsql_ISO-8859-1.sql $dbname > log_update.txt
- psql -U $dbuser -f pgsql/ISO-8859-1/update/update_2.5.1rc1_to_2.5.1_pgsql_ISO-8859-1.sql $dbname > log_update.txt
- psql -U $dbuser -f pgsql/ISO-8859-1/update/update_2.5.1_to_2.6rc1_pgsql_ISO-8859-1.sql $dbname > log_update.txt
+ psql -U $dbuser -f pgsql/pgsql_schema_2.5.sql $dbname > log_schema.txt 2> err_schema.txt
+ psql -U $dbuser -f pgsql/ISO-8859-1/pgsql_data_2.5.sql $dbname > log_data.txt 2> err_data.txt
+ psql -U $dbuser -f pgsql/pgsql_serial_set_sequences_2.5.sql $dbname > log_sequences.txt 2> err_squences.txt
+ psql -U $dbuser -f pgsql/ISO-8859-1/update/update_2.5_to_2.5.1rc1_pgsql_ISO-8859-1.sql $dbname > log_update.txt 2> err_update.txt
+ psql -U $dbuser -f pgsql/ISO-8859-1/update/update_2.5.1rc1_to_2.5.1_pgsql_ISO-8859-1.sql $dbname >> log_update.txt 2>> err_update.txt
+ psql -U $dbuser -f pgsql/ISO-8859-1/update/update_2.5.1_to_2.6rc1_pgsql_ISO-8859-1.sql $dbname >> log_update.txt 2>> err_update.txt
elif test $dbversion = "p" -a $dbenc = "u"
then
@@ -168,21 +169,27 @@
echo "The script will ask you several times for your database password. Don't be confused about this."
-
- if test $dbtemplate != ""
+ if test -n "$dbtemplate"
then
createdb -U $dbuser -E UTF-8 $dbname -T $dbtemplate
else
createdb -U $dbuser -E UTF-8 $dbname
fi
- psql -U $dbuser -f pgsql/pgsql_schema_2.5.sql $dbname > log_schema.txt
- psql -U $dbuser -f pgsql/UTF-8/pgsql_data_2.5.sql $dbname > log_data.txt
- psql -U $dbuser -f pgsql/pgsql_serial_set_sequences_2.5.sql $dbname > log_sequences.txt
- psql -U $dbuser -f pgsql/UTF-8/update/update_2.5_to_2.5.1rc1_pgsql_UTF-8.sql $dbname > log_update.txt
- psql -U $dbuser -f pgsql/UTF-8/update/update_2.5.1rc1_to_2.5.1_pgsql_UTF-8.sql $dbname > log_update.txt
- psql -U $dbuser -f pgsql/UTF-8/update/update_2.5.1_to_2.6rc1_pgsql_UTF-8.sql $dbname > log_update.txt
- psql -U $dbuser -f pgsql/UTF-8/update/update_2.6rc1_to_2.6rc2_pgsql_UTF-8.sql $dbname > log_update.txt
+ echo "creating schema"
+ psql -U $dbuser -f pgsql/pgsql_schema_2.5.sql $dbname > log_schema.txt 2> err_schema.txt
+ echo "importing 2.5 data"
+ psql -U $dbuser -f pgsql/UTF-8/pgsql_data_2.5.sql $dbname > log_data.txt 2> err_data.txt
+ echo "setting sequences"
+ psql -U $dbuser -f pgsql/pgsql_serial_set_sequences_2.5.sql $dbname > log_sequences.txt 2> err_sequences.txt
+ echo "update to 2.5.1rc1"
+ psql -U $dbuser -f pgsql/UTF-8/update/update_2.5_to_2.5.1rc1_pgsql_UTF-8.sql $dbname > log_update.txt 2> err_update.txt
+ echo "update to 2.5.1"
+ psql -U $dbuser -f pgsql/UTF-8/update/update_2.5.1rc1_to_2.5.1_pgsql_UTF-8.sql $dbname >> log_update.txt 2>> err_update.txt
+ echo "update to 2.6rc1"
+ psql -U $dbuser -f pgsql/UTF-8/update/update_2.5.1_to_2.6rc1_pgsql_UTF-8.sql $dbname >> log_update.txt 2>> err_update.txt
+ echo "update to 2.6rc2"
+ psql -U $dbuser -f pgsql/UTF-8/update/update_2.6rc1_to_2.6rc2_pgsql_UTF-8.sql $dbname >> log_update.txt 2>> err_update.txt
fi
echo "The installer can set the permissions to the files"
@@ -214,7 +221,7 @@
echo ""
echo "Compiling .po files..."
cd ../../tools/
-./i18n_update_mo.sh
+sh ./i18n_update_mo.sh
cd ../resources/db/
echo "removing permissions on /resources/locale/ and subdirectories"
chmod -R o-rw ../locale
More information about the Mapbender_commits
mailing list