X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fopenvim.git;a=blobdiff_plain;f=database_utils%2Finit_vim_db.sh;h=1edaa68d810419f571810b9cd9172fd5366f0af1;hp=16f34eac16366571d1ed10e92dd20baabfbd4ed8;hb=d87877c809892f536054fc7b072acc7f865b988b;hpb=928275586b85630582bae0a480491c54b50421f5

diff --git a/database_utils/init_vim_db.sh b/database_utils/init_vim_db.sh
index 16f34ea..1edaa68 100755
--- a/database_utils/init_vim_db.sh
+++ b/database_utils/init_vim_db.sh
@@ -97,7 +97,7 @@ DEF_EXTRA_FILE_PARAM="--defaults-extra-file=$TEMPFILE"
 if [ -z "${DBPASS}" ]
 then
     password_ok=""
-    echo -e "[client]\nuser='${DBUSER}'\npassword='vimpw'" > "$TEMPFILE"
+    echo -e "[client]\nuser='${DBUSER}'\npassword=vimpw" > "$TEMPFILE"
     mysql --defaults-extra-file="$TEMPFILE" $DBHOST_ $DBPORT_ $DBNAME -e "quit" >/dev/null 2>&1 && DBPASS="vimpw"
     echo -e "[client]\nuser='${DBUSER}'\npassword=''" > "$TEMPFILE"
     mysql --defaults-extra-file="$TEMPFILE" $DBHOST_ $DBPORT_ $DBNAME -e "quit" >/dev/null 2>&1 && DBPASS=""
@@ -128,6 +128,9 @@ echo "    loading ${DIRNAME}/vim_db_structure.sql"
 sed -e "s/vim_db/$DBNAME/" ${DIRNAME}/vim_db_structure.sql |  mysql $DEF_EXTRA_FILE_PARAM $DBHOST_ $DBPORT_
 
 echo "    migrage database version"
+#${DIRNAME}/migrate_vim_db.sh $DBHOST_ $DBPORT_ $DBUSER_ $DBPASS_ -d$DBNAME $1
+DIRNAME=$(dirname $(readlink -f ${BASH_SOURCE[0]}))
+echo "${DIRNAME}/migrate_vim_db.sh $DBHOST_ $DBPORT_ $DBUSER_ $DBPASS_ -d$DBNAME $1"
 ${DIRNAME}/migrate_vim_db.sh $DBHOST_ $DBPORT_ $DBUSER_ $DBPASS_ -d$DBNAME $1
 
 echo  "    loading ${DIRNAME}/host_ranking.sql"