X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=database_utils%2Finstall-db-server.sh;fp=database_utils%2Finstall-db-server.sh;h=5a9b9abc5105ef86614232e87bddae4f70279f9d;hb=57697f9ef826d2ba5490daee8ff55004d0635c7f;hp=4d816a56cc0fd651460d0523dd773dde65050369;hpb=071df95257d9d25adf5b30bf08a44cbc7df9b02c;p=osm%2Fopenvim.git diff --git a/database_utils/install-db-server.sh b/database_utils/install-db-server.sh index 4d816a5..5a9b9ab 100755 --- a/database_utils/install-db-server.sh +++ b/database_utils/install-db-server.sh @@ -23,7 +23,7 @@ function _create_db(){ ################################################################# ##### CREATE DATABASE ##### #################################################################' - echo -e "\nCreating temporary file form MYSQL installation and initialization" + echo -e "\nCreating temporary file for MYSQL installation and initialization" TEMPFILE="$(mktemp -q --tmpdir "installopenvim.XXXXXX")" trap 'rm -f "$TEMPFILE"' EXIT chmod 0600 "$TEMPFILE" @@ -35,8 +35,8 @@ function _create_db(){ [[ -n $QUIET_MODE ]] && DBDELETEPARAM="-f" mysqladmin --defaults-extra-file=$TEMPFILE -s drop ${DB_NAME} $DBDELETEPARAM || ! echo "Could not delete ${DB_NAME} database" || exit 1 mysqladmin --defaults-extra-file=$TEMPFILE -s create ${DB_NAME} || ! echo "1 Error creating ${DB_NAME} database" || exit 1 - echo "CREATE USER $DB_USER@'localhost' IDENTIFIED BY '$DB_PASS';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "2 Failed while creating user vim at database" - echo "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO $DB_USER@'localhost';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "3 Failed while creating user vim at database" || exit 1 + echo "CREATE USER $DB_USER@'localhost' IDENTIFIED BY '$DB_PASS';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "2 Failed while creating user ${DB_USER}" + echo "GRANT ALL PRIVILEGES ON ${DB_NAME}.* TO $DB_USER@'localhost';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "3 Failed while granting privileges to user ${DB_USER} at database ${DB_NAME}" || exit 1 echo " Database '${DB_NAME}' created, user $DB_USER password '$DB_PASS'" else echo "Database exists. Use option '--forcedb' to force the deletion of the existing one" && exit 1