From 2b867125b15368c605c010158ca818bdc6e450ef Mon Sep 17 00:00:00 2001
From: chen_10 <1803012703@qq.com>
Date: Wed, 23 Mar 2022 10:37:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=97=A5=E5=BF=97=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=91=BD=E5=90=8D=E6=96=B9=E5=BC=8F:=20=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA=20.=20=E4=B9=8B?=
 =?UTF-8?q?=E5=89=8D=E7=9A=84=E5=AD=97=E7=AC=A6=E4=B8=B2=E4=BD=9C=E4=B8=BA?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shell/task.sh | 43 +++++++++++++++----------------------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/shell/task.sh b/shell/task.sh
index 4473b42d..ec34fb70 100755
--- a/shell/task.sh
+++ b/shell/task.sh
@@ -68,6 +68,17 @@ usage() {
     fi
 }
 
+get_log_path() {
+    local first_param=$1
+    local log_time=$(date "+%Y-%m-%d-%H-%M-%S")
+    local log_dir_tmp="${first_param##*/}"
+    local log_dir_tmp_path="${first_param%%/*}"
+    log_dir_tmp_path="${log_dir_tmp_path##*/}"
+    [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
+    log_dir="$dir_log/${log_dir_tmp%.*}"
+    log_path="$log_dir/$log_time.log"
+}
+
 ## run nohup，$1：文件名，不含路径，带后缀
 run_nohup() {
     local file_name=$1
@@ -84,13 +95,7 @@ run_normal() {
         fi
     fi
 
-    log_time=$(date "+%Y-%m-%d-%H-%M-%S")
-    log_dir_tmp="${first_param##*/}"
-    log_dir_tmp_path="${first_param%%/*}"
-    log_dir_tmp_path="${log_dir_tmp_path##*/}"
-    [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
-    log_dir="$dir_log/${log_dir_tmp%%.*}"
-    log_path="$log_dir/$log_time.log"
+    get_log_path "$first_param"
     cmd="&>> $log_path"
     [[ "$show_log" == "true" ]] && cmd=""
     make_dir "$log_dir"
@@ -146,13 +151,7 @@ run_concurrent() {
     [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
 
     define_program "$first_param"
-    log_time=$(date "+%Y-%m-%d-%H-%M-%S")
-    log_dir_tmp="${first_param##*/}"
-    log_dir_tmp_path="${first_param%%/*}"
-    log_dir_tmp_path="${log_dir_tmp_path##*/}"
-    [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
-    log_dir="$dir_log/${log_dir_tmp%%.*}"
-    log_path="$log_dir/$log_time.log"
+    get_log_path "$first_param"
     cmd="&>> $log_path"
     [[ "$show_log" == "true" ]] && cmd=""
     make_dir $log_dir
@@ -208,13 +207,7 @@ run_designated() {
     fi
 
     define_program "$file_param"
-    log_time=$(date "+%Y-%m-%d-%H-%M-%S")
-    log_dir_tmp="${file_param##*/}"
-    log_dir_tmp_path="${file_param%%/*}"
-    log_dir_tmp_path="${log_dir_tmp_path##*/}"
-    [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
-    log_dir="$dir_log/${log_dir_tmp%%.*}"
-    log_path="$log_dir/$log_time.log"
+    get_log_path "$file_param"
     cmd="&>> $log_path"
     [[ "$show_log" == "true" ]] && cmd=""
     make_dir $log_dir
@@ -264,13 +257,7 @@ run_designated() {
 run_else() {
     local file_param="$1"
     define_program "$file_param"
-    log_time=$(date "+%Y-%m-%d-%H-%M-%S")
-    log_dir_tmp="${file_param##*/}"
-    log_dir_tmp_path="${file_param%%/*}"
-    log_dir_tmp_path="${log_dir_tmp_path##*/}"
-    [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
-    log_dir="$dir_log/${log_dir_tmp%%.*}"
-    log_path="$log_dir/$log_time.log"
+    get_log_path "$file_param"
     cmd="&>> $log_path"
     [[ "$show_log" == "true" ]] && cmd=""
     make_dir $log_dir