This commit is contained in:
kuaifan 2022-01-16 22:36:45 +08:00
parent c9a6d2f5a8
commit 9f62023175
7 changed files with 15 additions and 14 deletions

16
cmd
View File

@ -126,10 +126,10 @@ run_exec() {
echo -e "${Error} ${RedBG} 没有找到 $container 容器! ${Font}" echo -e "${Error} ${RedBG} 没有找到 $container 容器! ${Font}"
exit 1 exit 1
fi fi
if [ "$container" = "mariadb" ] || [ "$container" = "nginx" ] || [ "$container" = "redis" ]; then if [ "$container" = "php" ]; then
docker exec -it "$name" /bin/sh -c "$cmd"
else
docker exec -it "$name" /bin/bash -c "$cmd" docker exec -it "$name" /bin/bash -c "$cmd"
else
docker exec -it "$name" /bin/sh -c "$cmd"
fi fi
} }
@ -331,9 +331,9 @@ if [ $# -gt 0 ]; then
echo -e "${OK} ${GreenBG} 卸载完成 ${Font}" echo -e "${OK} ${GreenBG} 卸载完成 ${Font}"
elif [[ "$1" == "reinstall" ]]; then elif [[ "$1" == "reinstall" ]]; then
shift 1 shift 1
./cmd uninstall ./cmd uninstall $@
sleep 3 sleep 3
./cmd install ./cmd install $@
elif [[ "$1" == "port" ]]; then elif [[ "$1" == "port" ]]; then
shift 1 shift 1
env_set APP_PORT "$1" env_set APP_PORT "$1"
@ -396,10 +396,10 @@ if [ $# -gt 0 ]; then
elif [[ "$1" == "composer" ]]; then elif [[ "$1" == "composer" ]]; then
shift 1 shift 1
e="composer $@" && run_exec php "$e" e="composer $@" && run_exec php "$e"
elif [[ "$1" == "super" ]]; then elif [[ "$1" == "service" ]]; then
shift 1 shift 1
supervisorctl_restart "$@" e="service $@" && run_exec php "$e"
elif [[ "$1" == "supervisorctl" ]]; then elif [[ "$1" == "super" ]] || [[ "$1" == "supervisorctl" ]]; then
shift 1 shift 1
e="supervisorctl $@" && run_exec php "$e" e="supervisorctl $@" && run_exec php "$e"
elif [[ "$1" == "models" ]]; then elif [[ "$1" == "models" ]]; then

View File

@ -1,6 +1,6 @@
{ {
"name": "DooTask", "name": "DooTask",
"version": "0.6.31", "version": "0.6.34",
"description": "DooTask is task management system.", "description": "DooTask is task management system.",
"main": "main.js", "main": "main.js",
"license": "MIT", "license": "MIT",

View File

@ -1,6 +1,6 @@
{ {
"name": "DooTask", "name": "DooTask",
"version": "0.6.31", "version": "0.6.34",
"description": "DooTask is task management system.", "description": "DooTask is task management system.",
"scripts": { "scripts": {
"start": "./cmd dev", "start": "./cmd dev",

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
/*! /*!
* html2canvas 1.3.3 <https://html2canvas.hertzen.com> * html2canvas 1.4.0 <https://html2canvas.hertzen.com>
* Copyright (c) 2021 Niklas von Hertzen <https://hertzen.com> * Copyright (c) 2022 Niklas von Hertzen <https://hertzen.com>
* Released under MIT License * Released under MIT License
*/ */

File diff suppressed because one or more lines are too long

View File

@ -1,5 +1,6 @@
{ {
"/js/app.js": "/js/app.js", "/js/app.js": "/js/app.js",
"/css/app.css": "/css/app.css", "/css/app.css": "/css/app.css",
"/.DS_Store": "/.DS_Store",
"/favicon.ico": "/favicon.ico" "/favicon.ico": "/favicon.ico"
} }