From ac32117e783f8cac49262cf6a26c017df411d5a9 Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Mon, 6 Jun 2022 21:25:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B0=83=E8=AF=95=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E7=BB=93=E6=9D=9F=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/services/script.ts        | 6 ------
 shell/check.sh                 | 1 +
 shell/update.sh                | 1 -
 src/pages/script/editModal.tsx | 3 +--
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/back/services/script.ts b/back/services/script.ts
index 3973a316..9cadd6fb 100644
--- a/back/services/script.ts
+++ b/back/services/script.ts
@@ -19,12 +19,6 @@ export default class ScriptService {
   private taskCallbacks(filePath: string): TaskCallbacks {
     return {
       onEnd: async (cp, endTime, diff) => {
-        this.sockService.sendMessage({
-          type: 'manuallyRunScript',
-          message: `\n## 执行结束... ${endTime.format(
-            'YYYY-MM-DD HH:mm:ss',
-          )}  耗时 ${diff} 秒`,
-        });
         try {
           fs.unlinkSync(filePath);
         } catch (error) {}
diff --git a/shell/check.sh b/shell/check.sh
index cfab99d4..ff2fd978 100644
--- a/shell/check.sh
+++ b/shell/check.sh
@@ -88,6 +88,7 @@ check_pm2() {
 
 main() {
   echo -e "=====> 开始检测"
+  npm i -g pnpm
   pnpm add -g pm2
   copy_dep
   check_ql
diff --git a/shell/update.sh b/shell/update.sh
index 60bbaf4c..f8fc1882 100755
--- a/shell/update.sh
+++ b/shell/update.sh
@@ -305,7 +305,6 @@ patch_version() {
     fi
 
     # 兼容pnpm@7 
-    npm i -g pnpm
     pnpm setup
     source ~/.bashrc
 
diff --git a/src/pages/script/editModal.tsx b/src/pages/script/editModal.tsx
index b1a8b22f..ae9d3508 100644
--- a/src/pages/script/editModal.tsx
+++ b/src/pages/script/editModal.tsx
@@ -117,8 +117,7 @@ const EditModal = ({
       return;
     }
 
-    if (_message === '执行结束') {
-      _message = '';
+    if (_message.includes('执行结束')) {
       setTimeout(() => {
         setIsRunning(false);
       }, 300);