diff --git a/assets/usr/local/sbin/lib/mysql.sh b/assets/usr/local/sbin/lib/mysql.sh index 5b5701c..1e0c24f 100644 --- a/assets/usr/local/sbin/lib/mysql.sh +++ b/assets/usr/local/sbin/lib/mysql.sh @@ -4,16 +4,16 @@ # - Проверка существования БД db_connect() { -export DB_CONNECTION="-h ${DB_HOST} -u ${DB_USER} ${DB_NAME}" +export DB_CONNECTION="-h ${DBHOST} -u ${DBUSER} ${DBTABLE}" cat > ~/.my.cnf << EOF [mysql] -user=${DB_USER} -password=${DB_PASS} +user=${DBUSER} +password=${DBPASS} [mysqldump] -user=${DB_USER} -password=${DB_PASS} +user=${DBUSER} +password=${DBPASS} EOF chmod 600 ~/.my.cnf @@ -22,7 +22,7 @@ chmod 600 ~/.my.cnf db_drop() { [[ -z "${DB_CONNECTION}" ]] && db_connect - mysql ${DB_CONNECTION} -e "drop database ${DB_NAME}" + mysql ${DB_CONNECTION} -e "drop database ${DBTABLE}" } db_backup() { @@ -40,7 +40,7 @@ db_restore() { db_create() { # [[ -z "${DB_CONNECTION}" ]] && db_connect - mysql -h ${DB_HOST} -u ${DB_USER} -e "create database if not exist ${DB_NAME} charset utf8" + mysql -h ${DBHOST} -u ${DBUSER} -e "create database if not exist ${DBTABLE} charset utf8" } db_isExist() {