From 89185476aafd51908ac08bf37de6ce424b26df96 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Sun, 5 Feb 2023 12:37:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8E=B7=E5=8F=96cpu?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/op_waf/info.json          | 2 +-
 plugins/op_waf/shell/cpu_usage.sh | 4 +++-
 plugins/op_waf/tool_task.py       | 7 ++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/plugins/op_waf/info.json b/plugins/op_waf/info.json
index e37a26fdb..0e26c26a5 100755
--- a/plugins/op_waf/info.json
+++ b/plugins/op_waf/info.json
@@ -12,5 +12,5 @@
 	"home":"https://github.com/loveshell/ngx_lua_waf",
 	"date":"2019-04-21",
 	"pid": "1",
-	"versions": ["0.2.4"]
+	"versions": ["0.2.5"]
 }
\ No newline at end of file
diff --git a/plugins/op_waf/shell/cpu_usage.sh b/plugins/op_waf/shell/cpu_usage.sh
index 7ea6e3009..4de0bf2c3 100644
--- a/plugins/op_waf/shell/cpu_usage.sh
+++ b/plugins/op_waf/shell/cpu_usage.sh
@@ -4,4 +4,6 @@ DST_DIR=/www/server/op_waf
 DIS_FILE=${DST_DIR}/cpu.info
 
 CPU_USAGE=`top -bn 1 | fgrep 'Cpu(s)' | awk '{print 100 -$8}' | awk -F . '{print $1}'`
-echo $CPU_USAGE > $DIS_FILE
\ No newline at end of file
+echo $CPU_USAGE
+echo $CPU_USAGE > $DIS_FILE
+echo "done success!"
\ No newline at end of file
diff --git a/plugins/op_waf/tool_task.py b/plugins/op_waf/tool_task.py
index 0fe2f4fb3..7c3b4dd66 100644
--- a/plugins/op_waf/tool_task.py
+++ b/plugins/op_waf/tool_task.py
@@ -98,7 +98,12 @@ logs_file=$plugin_path/${rname}.log
     cmd += 'echo "★【`date +"%Y-%m-%d %H:%M:%S"`】 STSRT★" >> $logs_file' + "\n"
     cmd += 'echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" >> $logs_file' + "\n"
     cmd += 'echo "cd $mw_dir && source bin/activate && python3 $script_path/tool_task.py run >> $logs_file 2>&1"' + "\n"
-    cmd += 'cd $mw_dir && source bin/activate && python3 $script_path/tool_task.py run >> $logs_file 2>&1' + "\n"
+
+    if mw.isAppleSystem():
+        cmd += 'cd $mw_dir && source bin/activate && python3 $script_path/tool_task.py run >> $logs_file 2>&1' + "\n"
+    else:
+        cmd += 'cd $mw_dir && source bin/activate && bash $script_path/shell/cpu.info >> $logs_file 2>&1' + "\n"
+
     cmd += 'echo "【`date +"%Y-%m-%d %H:%M:%S"`】 END★" >> $logs_file' + "\n"
     cmd += 'echo "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" >> $logs_file' + "\n"