From 808d8bfffe558fea5ac0e72e569ee13b2dd204ee Mon Sep 17 00:00:00 2001 From: Leon Date: Sat, 7 Aug 2021 20:45:56 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8adjust?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Scripts/sh/1custom.sh | 14 +++++++------- Scripts/sh/1customCDN.sh | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Scripts/sh/1custom.sh b/Scripts/sh/1custom.sh index ebb7299..1e95f67 100644 --- a/Scripts/sh/1custom.sh +++ b/Scripts/sh/1custom.sh @@ -145,19 +145,19 @@ set_default_code(){ sed -i "/^repo6=/a\repo7='yuannian1112_jd_scripts'" $code_shell_path fi } -# 将 bash code.sh 添加到定时任务 -add_bash_code(){ +# 将 task code.sh 添加到定时任务 +add_task_code(){ if [ "$(grep -c "code.sh" /ql/config/crontab.list)" != 0 ]; then - echo "您的任务列表中已存在 task:bash code.sh" + echo "您的任务列表中已存在 task:task code.sh" else - echo "开始添加 task:bash code.sh" + echo "开始添加 task:task code.sh" # 获取token token=$(cat /ql/config/auth.json | jq --raw-output .token) - curl -s -H 'Accept: application/json' -H "Authorization: Bearer $token" -H 'Content-Type: application/json;charset=UTF-8' -H 'Accept-Language: zh-CN,zh;q=0.9' --data-binary '{"name":"格式化更新助力码","command":"bash /ql/config/code.sh &","schedule":"*/10 * * * *"}' --compressed 'http://127.0.0.1:5700/api/crons?t=1626247939659' + curl -s -H 'Accept: application/json' -H "Authorization: Bearer $token" -H 'Content-Type: application/json;charset=UTF-8' -H 'Accept-Language: zh-CN,zh;q=0.9' --data-binary '{"name":"格式化更新助力码","command":"task /ql/config/code.sh","schedule":"*/10 * * * *"}' --compressed 'http://127.0.0.1:5700/api/crons?t=1626247939659' fi } if [ "${all}" = 1 ]; then - dl_code_shell && set_default_code && add_bash_code + dl_code_shell && set_default_code && add_task_code elif [ "${code}" = 'n' ]; then echo "已为您跳过操作 code.sh" else @@ -168,7 +168,7 @@ else set_default_code fi if [[ ${code} =~ 'c' ]]; then - add_bash_code + add_task_code fi fi diff --git a/Scripts/sh/1customCDN.sh b/Scripts/sh/1customCDN.sh index 14e893e..e422add 100644 --- a/Scripts/sh/1customCDN.sh +++ b/Scripts/sh/1customCDN.sh @@ -192,30 +192,30 @@ set_default_code(){ sed -i "/^repo6=/a\repo7='yuannian1112_jd_scripts'" $code_shell_path fi } -# 将 bash code.sh 添加到定时任务 -add_bash_code(){ +# 将 task code.sh 添加到定时任务 +add_task_code(){ if [ "$(grep -c "code.sh" /ql/config/crontab.list)" != 0 ]; then - echo "您的任务列表中已存在 task:bash code.sh" + echo "您的任务列表中已存在 task:task code.sh" else - echo "开始添加 task:bash code.sh" + echo "开始添加 task:task code.sh" # 获取token token=$(cat /ql/config/auth.json | jq --raw-output .token) - curl -s -H 'Accept: application/json' -H "Authorization: Bearer $token" -H 'Content-Type: application/json;charset=UTF-8' -H 'Accept-Language: zh-CN,zh;q=0.9' --data-binary '{"name":"格式化更新助力码","command":"bash /ql/config/code.sh &","schedule":"*/10 * * * *"}' --compressed 'http://127.0.0.1:5700/api/crons?t=1626247939659' + curl -s -H 'Accept: application/json' -H "Authorization: Bearer $token" -H 'Content-Type: application/json;charset=UTF-8' -H 'Accept-Language: zh-CN,zh;q=0.9' --data-binary '{"name":"格式化更新助力码","command":"task /ql/config/code.sh","schedule":"*/10 * * * *"}' --compressed 'http://127.0.0.1:5700/api/crons?t=1626247939659' fi } if [ "${all}" = 1 ]; then - get_valid_code && dl_code_shell && set_default_code && add_bash_code + get_valid_code && dl_code_shell && set_default_code && add_task_code elif [ "${code}" = 'n' ]; then echo "已为您跳过操作 code.sh" else if [[ ${code} =~ 'a' ]]; then - get_valid_code && dl_code_shell + dl_code_shell fi if [[ ${code} =~ 'b' ]]; then set_default_code fi if [[ ${code} =~ 'c' ]]; then - add_bash_code + add_task_code fi fi