From 24f6070f9ec80e7ab3851fc332c50039355129e2 Mon Sep 17 00:00:00 2001 From: whyour Date: Sun, 3 Apr 2022 22:31:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dshell=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=88=AA=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shell/task.sh | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/shell/task.sh b/shell/task.sh index 4d9a8aa8..60c5faba 100755 --- a/shell/task.sh +++ b/shell/task.sh @@ -86,10 +86,12 @@ run_normal() { log_time=$(date "+%Y-%m-%d-%H-%M-%S") log_dir_tmp="${file_param##*/}" - if [[ $file_param == /* ]]; then - log_dir_tmp_path="${file_param:1}" - else - log_dir_tmp_path="${file_param}" + if [[ $file_param =~ "/" ]]; then + if [[ $file_param == /* ]]; then + log_dir_tmp_path="${file_param:1}" + else + log_dir_tmp_path="${file_param}" + fi fi log_dir_tmp_path="${log_dir_tmp_path%%/*}" log_dir_tmp_path="${log_dir_tmp_path##*/}" @@ -153,10 +155,12 @@ run_concurrent() { define_program "$file_param" log_time=$(date "+%Y-%m-%d-%H-%M-%S") log_dir_tmp="${file_param##*/}" - if [[ $file_param == /* ]]; then - log_dir_tmp_path="${file_param:1}" - else - log_dir_tmp_path="${file_param}" + if [[ $file_param =~ "/" ]]; then + if [[ $file_param == /* ]]; then + log_dir_tmp_path="${file_param:1}" + else + log_dir_tmp_path="${file_param}" + fi fi log_dir_tmp_path="${log_dir_tmp_path%%/*}" log_dir_tmp_path="${log_dir_tmp_path##*/}" @@ -220,10 +224,12 @@ run_designated() { define_program "$file_param" log_time=$(date "+%Y-%m-%d-%H-%M-%S") log_dir_tmp="${file_param##*/}" - if [[ $file_param == /* ]]; then - log_dir_tmp_path="${file_param:1}" - else - log_dir_tmp_path="${file_param}" + if [[ $file_param =~ "/" ]]; then + if [[ $file_param == /* ]]; then + log_dir_tmp_path="${file_param:1}" + else + log_dir_tmp_path="${file_param}" + fi fi log_dir_tmp_path="${log_dir_tmp_path%%/*}" log_dir_tmp_path="${log_dir_tmp_path##*/}" @@ -281,10 +287,12 @@ run_else() { define_program "$file_param" log_time=$(date "+%Y-%m-%d-%H-%M-%S") log_dir_tmp="${file_param##*/}" - if [[ $file_param == /* ]]; then - log_dir_tmp_path="${file_param:1}" - else - log_dir_tmp_path="${file_param}" + if [[ $file_param =~ "/" ]]; then + if [[ $file_param == /* ]]; then + log_dir_tmp_path="${file_param:1}" + else + log_dir_tmp_path="${file_param}" + fi fi log_dir_tmp_path="${log_dir_tmp_path%%/*}" log_dir_tmp_path="${log_dir_tmp_path##*/}"