修复shell函数返回值

This commit is contained in:
whyour 2021-05-07 23:20:39 +08:00
parent 14bd680202
commit 330bbbe466
2 changed files with 8 additions and 7 deletions

View File

@ -31,9 +31,9 @@ add_cron_api() {
code=$(echo $api | jq -r .code) code=$(echo $api | jq -r .code)
message=$(echo $api | jq -r .message) message=$(echo $api | jq -r .message)
if [[ $code == 200 ]]; then if [[ $code == 200 ]]; then
return "$name 添加成功" echo -e"$name 添加成功"
else else
return "$name 添加失败(${message})" echo -e"$name 添加失败(${message})"
fi fi
} }
@ -67,9 +67,9 @@ update_cron_api() {
code=$(echo $api | jq -r .code) code=$(echo $api | jq -r .code)
message=$(echo $api | jq -r .message) message=$(echo $api | jq -r .message)
if [[ $code == 200 ]]; then if [[ $code == 200 ]]; then
return "$name 更新成功" echo -e"$name 更新成功"
else else
return "$name 更新失败(${message})" echo -e"$name 更新失败(${message})"
fi fi
} }
@ -90,9 +90,9 @@ del_cron_api() {
code=$(echo $api | jq -r .code) code=$(echo $api | jq -r .code)
message=$(echo $api | jq -r .message) message=$(echo $api | jq -r .message)
if [[ $code == 200 ]]; then if [[ $code == 200 ]]; then
return "$name 删除成功" echo -e"$name 删除成功"
else else
return "$name 删除失败(${message})" echo -e"$name 删除失败(${message})"
fi fi
} }

View File

@ -207,7 +207,8 @@ update_raw() {
[[ -z $cron_name ]] && cron_name="$raw_file_name" [[ -z $cron_name ]] && cron_name="$raw_file_name"
[[ -z $cron_line ]] && cron_line="0 6 * * *" [[ -z $cron_line ]] && cron_line="0 6 * * *"
if [[ -z $cron_id ]]; then if [[ -z $cron_id ]]; then
add_cron_api "$cron_line:$cmd_task $filename:$cron_name" result=$(add_cron_api "$cron_line:$cmd_task $filename:$cron_name")
notify "新增任务通知" "\n$result"
# update_cron_api "$cron_line:$cmd_task $filename:$cron_name:$cron_id" # update_cron_api "$cron_line:$cmd_task $filename:$cron_name:$cron_id"
fi fi
else else