bug 608 Database migration recovering with docker relaunch

[osm/openvim.git] / database_utils / init_vim_db.sh

diff --git a/database_utils/init_vim_db.sh b/database_utils/init_vim_db.sh
index a15627b..aca7673 100755 (executable)
--- a/database_utils/init_vim_db.sh
+++ b/database_utils/init_vim_db.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ##
-# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
+# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U.
 # This file is part of openvim
 # All Rights Reserved.
 #
@@ -128,7 +128,7 @@ if [ -n "${CREATEDB}" ] ; then
         echo
     done
     # echo "    deleting previous database ${DBNAME} if it exists"
-    mysqladmin $DEF_EXTRA_FILE_PARAM DROP "${DBNAME}" ${QUIET_MODE/q/f} && echo "Previous database deleted"
+    mysqladmin $DEF_EXTRA_FILE_PARAM DROP "${DBNAME}" -f && echo "Previous database deleted"
     echo "    creating database ${DBNAME}"
     mysqladmin $DEF_EXTRA_FILE_PARAM create "${DBNAME}" || exit 1
 fi
@@ -162,7 +162,8 @@ DBPORT_="-P$DBPORT"
 
 
 echo "    loading ${DIRNAME}/vim_db_structure.sql"
-sed -e "s/{{vim_db}}/$DBNAME/" ${DIRNAME}/vim_db_structure.sql |  mysql $DEF_EXTRA_FILE_PARAM
+sed -e "s/{{vim_db}}/$DBNAME/" ${DIRNAME}/vim_db_structure.sql | mysql $DEF_EXTRA_FILE_PARAM ||
+    ! echo "ERROR at init $DBNAME" || exit 1
 
 echo  "    loading ${DIRNAME}/host_ranking.sql"
 mysql $DEF_EXTRA_FILE_PARAM $DBNAME < ${DIRNAME}/host_ranking.sql