From 3013111e2bacf73c023c8bbe8e7c768e8cb57925 Mon Sep 17 00:00:00 2001 From: sHa Date: Fri, 7 Jun 2019 16:55:59 +0300 Subject: [PATCH] Update --- README.md | 30 +++++++++++++++++++++--- package.json | 15 ++++++++++-- scripts/app.artisan.sh | 10 -------- scripts/app.composer.sh | 11 --------- scripts/app.git.sh | 10 -------- scripts/app.php.sh | 12 ---------- scripts/app.yarn.sh | 10 -------- scripts/app/artisan.sh | 19 +++++++++++++++ scripts/app/composer.sh | 19 +++++++++++++++ scripts/app/git.sh | 26 ++++++++++++++++++++ scripts/{app.npm.sh => app/npm.sh} | 9 +++++++ scripts/app/php.sh | 26 ++++++++++++++++++++ scripts/app/yarn.sh | 19 +++++++++++++++ scripts/{db.dump.sh => db/dump.sh} | 0 scripts/db/mysql.sh | 19 +++++++++++++++ scripts/{db.restore.sh => db/restore.sh} | 0 16 files changed, 177 insertions(+), 58 deletions(-) delete mode 100755 scripts/app.artisan.sh delete mode 100755 scripts/app.composer.sh delete mode 100755 scripts/app.git.sh delete mode 100755 scripts/app.php.sh delete mode 100755 scripts/app.yarn.sh create mode 100755 scripts/app/artisan.sh create mode 100755 scripts/app/composer.sh create mode 100755 scripts/app/git.sh rename scripts/{app.npm.sh => app/npm.sh} (55%) create mode 100755 scripts/app/php.sh create mode 100755 scripts/app/yarn.sh rename scripts/{db.dump.sh => db/dump.sh} (100%) create mode 100755 scripts/db/mysql.sh rename scripts/{db.restore.sh => db/restore.sh} (100%) diff --git a/README.md b/README.md index cb8c555..34e80a0 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,8 @@ yarn # Scripts -## 📁 git +## 📁 git (2) +subfolder: `/git` ### storage_push Upload all changes in storage folder into git repository @@ -35,11 +36,13 @@ Upload all changes in storage folder into git repository ### submodule_pull Update git submodules -## 📁 File system +## 📁 File system (1) +subfolder: `/fs` ### fix_permissions -## 📁 Docker +## 📁 Docker (3) +subfolder: `/docker` ### up run docker-compose containers in demonise @@ -51,3 +54,24 @@ stop docker-compose containers ## prune Cleanup Docker + +## 📁 app (6) +execute command in 'app' container + +subfolder: `/app` + +### php +### npm +### yarn +### git +### composer +### artisan + +## 📁 db (3) +execute command in 'db' container + +subfolder: `/db` + +### mysql +### dump +### restore diff --git a/package.json b/package.json index f86b3fd..7a35a75 100644 --- a/package.json +++ b/package.json @@ -19,9 +19,20 @@ "fs.fix_permissions": "./scripts/fs/fix_permissions.sh", "docker.up": "./scripts/docker/up.sh", "docker.down": "./scripts/docker/down.sh", - "docker.prune": "./scripts/docker/prune.sh" + "docker.prune": "./scripts/docker/prune.sh", + "app.artisan": "./scripts/app/artisan.sh", + "app.composer": "./scripts/app/composer.sh", + "app.git": "./scripts/app/git.sh", + "app.npm": "./scripts/app/npm.sh", + "app.yarn": "./scripts/app/yarn.sh", + "app.php": "./scripts/app/php.sh", + "db.mysql": "./scripts/db/mysql.sh", + "db.dump": "./scripts/db/dump.sh", + "db.restore": "./scripts/db/restore.sh" }, "scripts": { - "publ": "npm version patch; git add *; git commit -mUpdate; git push; npm publish" + "pub_stage1": "git add * && git commit -mUpdate", + "pub_stage2": "npm version patch && && git commit -mUpdate && git push", + "pub_stage3": "npm publish" } } diff --git a/scripts/app.artisan.sh b/scripts/app.artisan.sh deleted file mode 100755 index 8b2e414..0000000 --- a/scripts/app.artisan.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# -# @package sscripts -# @author sHa -# @copyright 2019 shadoll -# @version 19.6.7 -# @link https://shadoll.dev -# - -docker-compose exec app php artisan "$@" diff --git a/scripts/app.composer.sh b/scripts/app.composer.sh deleted file mode 100755 index 29ed070..0000000 --- a/scripts/app.composer.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# -# @package sscripts -# @author sHa -# @copyright 2019 shadoll -# @version 19.6.7 -# @link https://shadoll.dev -# - - -docker-compose exec app composer "$@" diff --git a/scripts/app.git.sh b/scripts/app.git.sh deleted file mode 100755 index 1f63372..0000000 --- a/scripts/app.git.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# -# @package sscripts -# @author sHa -# @copyright 2019 shadoll -# @version 19.6.7 -# @link https://shadoll.dev -# - -docker-compose exec app git "$@" diff --git a/scripts/app.php.sh b/scripts/app.php.sh deleted file mode 100755 index 1b1cfc3..0000000 --- a/scripts/app.php.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# -# @package sscripts -# @author sHa -# @copyright 2019 shadoll -# @version 19.6.7 -# @link https://shadoll.dev -# - -# appname=$(awk -F'=' '/^APPNAME/ { print $2}' ./docker/.env) - -docker-compose exec app php "$@" diff --git a/scripts/app.yarn.sh b/scripts/app.yarn.sh deleted file mode 100755 index 5649a01..0000000 --- a/scripts/app.yarn.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# -# @package sscripts -# @author sHa -# @copyright 2019 shadoll -# @version 19.6.7 -# @link https://shadoll.dev -# - -docker-compose exec app yarn "$@" diff --git a/scripts/app/artisan.sh b/scripts/app/artisan.sh new file mode 100755 index 0000000..95b143f --- /dev/null +++ b/scripts/app/artisan.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# +# @package sscripts +# @author sHa +# @copyright 2019 shadoll +# @version 19.6.7 +# @link https://shadoll.dev +# + +DIR=$(dirname $BASH_SOURCE) +PROJECT=(${DIR//node_modules/ }) + +if [ ! -f $PROJECT/docker-compose.yml ]; then + echo "ERROR: '$PROJECT/docker-compose.yml' file not found" + exit 1 +fi + +cd $PROJECT +docker-compose exec app php artisan "$@" diff --git a/scripts/app/composer.sh b/scripts/app/composer.sh new file mode 100755 index 0000000..97f6e85 --- /dev/null +++ b/scripts/app/composer.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# +# @package sscripts +# @author sHa +# @copyright 2019 shadoll +# @version 19.6.7 +# @link https://shadoll.dev +# + +DIR=$(dirname $BASH_SOURCE) +PROJECT=(${DIR//node_modules/ }) + +if [ ! -f $PROJECT/docker-compose.yml ]; then + echo "ERROR: '$PROJECT/docker-compose.yml' file not found" + exit 1 +fi + +cd $PROJECT +docker-compose exec app composer "$@" diff --git a/scripts/app/git.sh b/scripts/app/git.sh new file mode 100755 index 0000000..d544612 --- /dev/null +++ b/scripts/app/git.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# +# @package sscripts +# @author sHa +# @copyright 2019 shadoll +# @version 19.6.7 +# @link https://shadoll.dev +# + +DIR=$(dirname $BASH_SOURCE) +PROJECT=(${DIR//node_modules/ }) + +if [ ! -f $PROJECT/docker-compose.yml ]; then + echo "ERROR: '$PROJECT/docker-compose.yml' file not found" + exit 1 +fi + +cd $PROJECT + +docker-compose exec git --version 2>&1 >/dev/null +GIT_IS_AVAILABLE=$? +if [ $GIT_IS_AVAILABLE -ne 0 ]; then + echo "ERROR: The program 'git' is currently not installed." + exit 1 +fi +docker-compose exec app git "$@" diff --git a/scripts/app.npm.sh b/scripts/app/npm.sh similarity index 55% rename from scripts/app.npm.sh rename to scripts/app/npm.sh index 831a643..ab4e5b3 100755 --- a/scripts/app.npm.sh +++ b/scripts/app/npm.sh @@ -9,4 +9,13 @@ # appname=$(awk -F'=' '/^APPNAME/ { print $2}' ./docker/.env) +DIR=$(dirname $BASH_SOURCE) +PROJECT=(${DIR//node_modules/ }) + +if [ ! -f $PROJECT/docker-compose.yml ]; then + echo "ERROR: '$PROJECT/docker-compose.yml' file not found" + exit 1 +fi + +cd $PROJECT docker-compose exec app npm "$@" diff --git a/scripts/app/php.sh b/scripts/app/php.sh new file mode 100755 index 0000000..64d1a46 --- /dev/null +++ b/scripts/app/php.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# +# @package sscripts +# @author sHa +# @copyright 2019 shadoll +# @version 19.6.7 +# @link https://shadoll.dev +# + +DIR=$(dirname $BASH_SOURCE) +PROJECT=(${DIR//node_modules/ }) + +if [ ! -f $PROJECT/docker-compose.yml ]; then + echo "ERROR: '$PROJECT/docker-compose.yml' file not found" + exit 1 +fi + +cd $PROJECT + +docker-compose exec php --version 2>&1 >/dev/null +GIT_IS_AVAILABLE=$? +if [ $GIT_IS_AVAILABLE -ne 0 ]; then + echo "ERROR: The program 'php' is currently not installed." + exit 1 +fi +docker-compose exec app php "$@" diff --git a/scripts/app/yarn.sh b/scripts/app/yarn.sh new file mode 100755 index 0000000..7b9c0ce --- /dev/null +++ b/scripts/app/yarn.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# +# @package sscripts +# @author sHa +# @copyright 2019 shadoll +# @version 19.6.7 +# @link https://shadoll.dev +# + +DIR=$(dirname $BASH_SOURCE) +PROJECT=(${DIR//node_modules/ }) + +if [ ! -f $PROJECT/docker-compose.yml ]; then + echo "ERROR: '$PROJECT/docker-compose.yml' file not found" + exit 1 +fi + +cd $PROJECT +docker-compose exec app yarn "$@" diff --git a/scripts/db.dump.sh b/scripts/db/dump.sh similarity index 100% rename from scripts/db.dump.sh rename to scripts/db/dump.sh diff --git a/scripts/db/mysql.sh b/scripts/db/mysql.sh new file mode 100755 index 0000000..07ce33a --- /dev/null +++ b/scripts/db/mysql.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# +# @package sscripts +# @author sHa +# @copyright 2019 shadoll +# @version 19.6.7 +# @link https://shadoll.dev +# + +DIR=$(dirname $BASH_SOURCE) +PROJECT=(${DIR//node_modules/ }) + +if [ ! -f $PROJECT/docker-compose.yml ]; then + echo "ERROR: '$PROJECT/docker-compose.yml' file not found" + exit 1 +fi + +cd $PROJECT +docker-compose exec db mysql "$@" diff --git a/scripts/db.restore.sh b/scripts/db/restore.sh similarity index 100% rename from scripts/db.restore.sh rename to scripts/db/restore.sh