From 0214c6f81ba1e2056f710eb371f517e930f1dbe0 Mon Sep 17 00:00:00 2001
From: hanhh <18330117883@163.com>
Date: Fri, 9 Jul 2021 22:39:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=92=A4=E5=9B=9Etask=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shell/task.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/shell/task.sh b/shell/task.sh
index 565eb300..ee922618 100755
--- a/shell/task.sh
+++ b/shell/task.sh
@@ -91,15 +91,11 @@ run_normal() {
     local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
     echo -e "## 开始执行... $begin_time\n" | tee -a $log_path
     [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path"
-    echo -e "\n## task_before开始\n" | tee -a $log_path
-    . $file_task_before 2>&1 | tee -a $log_path
-    echo -e "\n## task_before结束" | tee -a $log_path
+    . $file_task_before
 
     timeout $command_timeout_time $which_program $p1 2>&1 | tee -a $log_path
 
-    echo -e "\n## task_after开始\n" | tee -a $log_path
-    . $file_task_after 2>&1 | tee -a $log_path
-    echo -e "\n## task_after结束\n" | tee -a $log_path
+    . $file_task_after
     [[ $id ]] && update_cron "\"$id\"" "1" "" "$log_path"
     local end_time=$(date '+%Y-%m-%d %H:%M:%S')
     local diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))