projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Merge v1.0 branch into master"
[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
..
224269b
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
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"
DBHOST_="-h$DBHOST"
DBPORT_="-P$DBPORT"
@@
-133,7
+133,8
@@
if [ -n "${CREATEDB}" ]; then
fi
echo " loading ${DIRNAME}/${DBNAME}_structure.sql"
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
echo " migrage database version"
${DIRNAME}/migrate_mano_db.sh $DBHOST_ $DBPORT_ $DBUSER_ $DBPASS_ -d$DBNAME