From d630f34505c4ca764242526b30262fab9f1d34bf Mon Sep 17 00:00:00 2001 From: hanhh <18330117883@163.com> Date: Sun, 20 Jun 2021 20:15:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1=E5=B9=B6?= =?UTF-8?q?=E5=8F=91=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shell/task.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/shell/task.sh b/shell/task.sh index 91c35dad..c172a414 100755 --- a/shell/task.sh +++ b/shell/task.sh @@ -99,8 +99,13 @@ run_normal() { run_concurrent() { local p1=$1 local p3=$3 + if [[ ! $p3 ]]; then + echo -e "\n 缺少并发运行的环境变量参数" + exit 1 + fi + local envs=$(eval echo "\$${p3}") - local array=(${envs//&/}) + local array=($(echo $envs | sed 's/&/ /g')) cd $dir_scripts define_program "$p1" log_dir="$dir_log/${p1%%.*}" @@ -109,7 +114,7 @@ run_concurrent() { echo -e "\n各账号间已经在后台开始并发执行,前台不输入日志,日志直接写入文件中。\n" for i in "${!array[@]}"; do export ${p3}=${array[i]} - log_path="$log_dir/${log_time}_${user_num}.log" + log_path="$log_dir/${log_time}_$((i+1)).log" timeout $command_timeout_time $which_program $p1 &>$log_path & done } @@ -133,7 +138,7 @@ main() { 1) run_normal $1 ;; - 2) + 2|3) case $2 in now) run_normal $1 $2