diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 0d44e8eb..5b136a11 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -22,17 +22,17 @@ echo -e "nginx启动成功...\n" echo -e "======================4. 启动面板监控========================\n" pm2 delete public &>/dev/null -pm2 start $dir_static/build/public.js -n public --source-map-support --time +pm2 start $dir_root/build/public.js -n public --source-map-support --time echo -e "监控服务启动成功...\n" echo -e "======================5. 启动控制面板========================\n" pm2 delete panel &>/dev/null -pm2 start $dir_static/build/app.js -n panel --source-map-support --time +pm2 start $dir_root/build/app.js -n panel --source-map-support --time echo -e "控制面板启动成功...\n" echo -e "======================6. 启动定时任务========================\n" pm2 delete schedule &>/dev/null -pm2 start $dir_static/build/schedule.js -n schedule --source-map-support --time +pm2 start $dir_root/build/schedule.js -n schedule --source-map-support --time echo -e "定时任务启动成功...\n" if [[ $AutoStartBot == true ]]; then diff --git a/shell/check.sh b/shell/check.sh index 27b27237..e4408426 100644 --- a/shell/check.sh +++ b/shell/check.sh @@ -38,10 +38,10 @@ reload_pm2() { pm2 l &>/dev/null pm2 delete panel --source-map-support --time &>/dev/null - pm2 start $dir_static/build/app.js -n panel --source-map-support --time &>/dev/null + pm2 start $dir_root/build/app.js -n panel --source-map-support --time &>/dev/null pm2 delete schedule --source-map-support --time &>/dev/null - pm2 start $dir_static/build/schedule.js -n schedule --source-map-support --time &>/dev/null + pm2 start $dir_root/build/schedule.js -n schedule --source-map-support --time &>/dev/null } pm2_log() { diff --git a/shell/share.sh b/shell/share.sh index 57f456ce..e236636b 100755 --- a/shell/share.sh +++ b/shell/share.sh @@ -165,7 +165,6 @@ define_cmd() { } fix_config() { - make_dir $dir_static make_dir $dir_data make_dir $dir_config make_dir $dir_log diff --git a/shell/update.sh b/shell/update.sh index 3cd5e163..ff6eec1e 100755 --- a/shell/update.sh +++ b/shell/update.sh @@ -277,8 +277,8 @@ update_qinglong() { local static_version=$(cat $dir_root/src/version.ts | perl -pe "s|.*\'(.*)\';\.*|\1|" | head -1) echo -e "\n当前版本 $static_version...\n" - rm -rf $dir_static/* - cp -rf $ql_static_repo/* $dir_static + rm -rf $dir_root/build/* + cp -rf $ql_static_repo/* $dir_root if [[ $no_restart != "no-restart" ]]; then nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf echo -e "重启面板中..." @@ -337,10 +337,10 @@ reload_pm2() { pm2 l &>/dev/null pm2 delete panel --source-map-support --time &>/dev/null - pm2 start $dir_static/build/app.js -n panel --source-map-support --time &>/dev/null + pm2 start $dir_root/build/app.js -n panel --source-map-support --time &>/dev/null pm2 delete schedule --source-map-support --time &>/dev/null - pm2 start $dir_static/build/schedule.js -n schedule --source-map-support --time &>/dev/null + pm2 start $dir_root/build/schedule.js -n schedule --source-map-support --time &>/dev/null } ## 对比脚本