From ee74e637d20f95a768305e44e8ff475c4b7adbb7 Mon Sep 17 00:00:00 2001
From: sHa <sha@shadoll.dev>
Date: Thu, 26 Sep 2019 09:05:12 +0300
Subject: [PATCH] Update

---
 scripts/db/dump.sh    |  5 +++--
 scripts/db/mysql.sh   |  7 +++++--
 scripts/db/restore.sh | 20 ++++++++++++++------
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/scripts/db/dump.sh b/scripts/db/dump.sh
index 15efc91..ca877c6 100755
--- a/scripts/db/dump.sh
+++ b/scripts/db/dump.sh
@@ -3,7 +3,7 @@
 # @package   sscripts
 # @author    sHa <sha@shadoll.dev>
 # @copyright 2019 shadoll
-# @version   19.7.11
+# @version   19.9.26
 # @link      https://shadoll.dev
 #
 
@@ -19,5 +19,6 @@ cd $PROJECT
 
 DATABASE=$(awk -F'=' '/^DB_DATABASE/ { print $2}' $PROJECT/.env)
 PWD=$(awk -F'=' '/^DB_ROOT_PASSWORD/ { print $2}' $PROJECT/.env)
+HOST=$(awk -F'=' '/^DB_HOST/ { print $2}' $PROJECT/.env)
 
-docker-compose exec db /usr/bin/mysqldump --skip-comments -uroot --password=$PWD $DATABASE > $PROJECT/storage/database/dump/database.sql 2>/dev/null
+docker-compose exec $HOST /usr/bin/mysqldump --skip-comments -uroot --password=$PWD $DATABASE > $PROJECT/storage/database/dump/database.sql 2>/dev/null
diff --git a/scripts/db/mysql.sh b/scripts/db/mysql.sh
index 07ce33a..50ce5e1 100755
--- a/scripts/db/mysql.sh
+++ b/scripts/db/mysql.sh
@@ -3,7 +3,7 @@
 # @package   sscripts
 # @author    sHa <sha@shadoll.dev>
 # @copyright 2019 shadoll
-# @version   19.6.7
+# @version   19.9.26
 # @link      https://shadoll.dev
 #
 
@@ -16,4 +16,7 @@ if [ ! -f $PROJECT/docker-compose.yml ]; then
 fi
 
 cd $PROJECT
-docker-compose exec db mysql "$@"
+
+HOST=$(awk -F'=' '/^DB_HOST/ { print $2}' $PROJECT/.env)
+
+docker-compose exec $HOST mysql "$@"
diff --git a/scripts/db/restore.sh b/scripts/db/restore.sh
index fc64b73..84b837a 100755
--- a/scripts/db/restore.sh
+++ b/scripts/db/restore.sh
@@ -3,14 +3,22 @@
 # @package   sscripts
 # @author    sHa <sha@shadoll.dev>
 # @copyright 2019 shadoll
-# @version   19.6.7
+# @version   19.9.26
 # @link      https://shadoll.dev
 #
 
-DIR=$(dirname "$0")
-ROOT=$(cd "$DIR"/.. && pwd)
+DIR=$(dirname $BASH_SOURCE)
+PROJECT=(${DIR//node_modules/ })
 
-DATABASE=$(awk -F'=' '/^MYSQL_DATABASE/ { print $2}' $ROOT/docker/config.env)
-PWD=$(awk -F'=' '/^MYSQL_ROOT_PASSWORD/ { print $2}' $ROOT/docker/config.env)
+if [ ! -f $PROJECT/docker-compose.yml ]; then
+    echo "ERROR: '$PROJECT/docker-compose.yml' file not found"
+    exit 1
+fi
 
-docker-compose exec db /usr/bin/mysql -uroot --password=$PWD $DATABASE < $ROOT/storage/database/dump/database.sql
+cd $PROJECT
+
+DATABASE=$(awk -F'=' '/^DB_DATABASE/ { print $2}' $PROJECT/.env)
+PWD=$(awk -F'=' '/^DB_ROOT_PASSWORD/ { print $2}' $PROJECT/.env)
+HOST=$(awk -F'=' '/^DB_HOST/ { print $2}' $PROJECT/.env)
+
+docker-compose exec $HOST /usr/bin/mysql -uroot --password=$PWD $DATABASE < $PROJECT/storage/database/dump/database.sql