enhance on database migration not prompt for pass if no needed

[osm/RO.git] / database_utils / init_mano_db.sh

diff --git a/database_utils/init_mano_db.sh b/database_utils/init_mano_db.sh
index 4b73441..f7401a0 100755 (executable)
--- a/database_utils/init_mano_db.sh
+++ b/database_utils/init_mano_db.sh
@@ -91,9 +91,9 @@ done
 shift $((OPTIND-1))
 
 #check and ask for database user password
-#DBUSER_="-u$DBUSER"
-#DBPASS_=""
-#[ -n "$DBPASS" ] && DBPASS_="-p$DBPASS"
+DBUSER_="-u$DBUSER"
+DBPASS_=""
+[ -n "$DBPASS" ] && DBPASS_="-p$DBPASS"
 DBHOST_="-h$DBHOST"
 DBPORT_="-P$DBPORT"
 
@@ -129,11 +129,12 @@ if [ -n "${CREATEDB}" ]; then
     echo "    deleting previous database ${DBNAME}"
     echo "DROP DATABASE IF EXISTS ${DBNAME}" | mysql $DEF_EXTRA_FILE_PARAM $DBHOST_ $DBPORT_
     echo "    creating database ${DBNAME}"
-    mysqladmin $DEF_EXTRA_FILE_PARAM -s create ${DBNAME} || exit 1
+    mysqladmin $DEF_EXTRA_FILE_PARAM $DBHOST_ $DBPORT_ -s create ${DBNAME} || exit 1
 fi
 
 echo "    loading ${DIRNAME}/${DBNAME}_structure.sql"
-mysql $DEF_EXTRA_FILE_PARAM $DBHOST_ $DBPORT $DBNAME < ${DIRNAME}/mano_db_structure.sql
+#echo 'mysql '$DEF_EXTRA_FILE_PARAM' '$DBHOST_' '$DBPORT_' '$DBNAME' < '${DIRNAME}'/mano_db_structure.sql'
+mysql $DEF_EXTRA_FILE_PARAM $DBHOST_ $DBPORT_ $DBNAME < ${DIRNAME}/mano_db_structure.sql
 
 echo "    migrage database version"
 ${DIRNAME}/migrate_mano_db.sh $DBHOST_ $DBPORT_ $DBUSER_ $DBPASS_ -d$DBNAME