From 5b9c38385ac640720781066a9c8b23dd97fe2168 Mon Sep 17 00:00:00 2001
From: hanhh <18330117883@163.com>
Date: Wed, 16 Jun 2021 23:02:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E7=A8=8B=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E5=91=BD=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/docker-entrypoint.sh | 11 ++++++-----
 shell/update.sh             |  8 +++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index fc3af305..66ba153b 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -14,8 +14,9 @@ nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
 echo -e "nginx启动成功...\n"
 
 echo -e "======================3. 启动控制面板========================\n"
-cd $dir_root
-if [[ $(pm2 info panel 2>/dev/null) ]]; then
+
+app_pid=$(ps -ef | grep "app.js" | grep -v grep)
+if [ "$app_pid" != "" ]; then
   pm2 reload panel
 else
   pm2 start $dir_root/build/app.js -n panel
@@ -23,8 +24,9 @@ fi
 echo -e "控制面板启动成功...\n"
 
 echo -e "======================4. 启动定时任务========================\n"
-cd $dir_root
-if [[ $(pm2 info schedule 2>/dev/null) ]]; then
+
+schedule_pid=$(ps -ef | grep "schedule.js" | grep -v grep)
+if [ "$schedule_pid" != "" ]; then
   pm2 reload schedule
 else
   pm2 start $dir_root/build/schedule.js -n schedule
@@ -33,7 +35,6 @@ echo -e "定时任务启动成功...\n"
 
 if [[ $AutoStartBot == true ]]; then
   echo -e "======================5. 启动bot========================\n"
-  cd $dir_root
   ql bot
 fi
 
diff --git a/shell/update.sh b/shell/update.sh
index 28ebe2d8..99cbd160 100755
--- a/shell/update.sh
+++ b/shell/update.sh
@@ -298,13 +298,15 @@ update_qinglong() {
 }
 
 reload_pm2() {
-    if [[ $(pm2 info panel 2>/dev/null) ]]; then
+    local app_pid=$(ps -ef | grep "app.js" | grep -v grep)
+    if [ "$app_pid" != "" ]; then
         pm2 reload panel >/dev/null 2>&1
     else
         pm2 start $dir_root/build/app.js -n panel >/dev/null 2>&1
     fi
 
-    if [[ $(pm2 info schedule 2>/dev/null) ]]; then
+    local schedule_pid=$(ps -ef | grep "schedule.js" | grep -v grep)
+    if [ "$schedule_pid" != "" ]; then
         pm2 reload schedule >/dev/null 2>&1
     else
         pm2 start $dir_root/build/schedule.js -n schedule >/dev/null 2>&1
@@ -355,7 +357,7 @@ gen_list_repo() {
     rm -f $dir_list_tmp/${repo}*.list >/dev/null 2>&1
 
     cd ${repo_path}
-    
+
     local cmd="find ."
     local index=0
     for extension in $file_extensions; do