diff --git a/Scripts/sh/1customCDNN.sh b/Scripts/sh/1customCDNN.sh index 3079d3b..9f56308 100644 --- a/Scripts/sh/1customCDNN.sh +++ b/Scripts/sh/1customCDNN.sh @@ -79,6 +79,49 @@ else fi +# 获取有效 gitfix.sh 链接 +get_valid_git() { + git_list=(https://git.metauniverse-cn.com/https://raw.githubusercontent.com/yanyuwangluo/VIP/main/Scripts/sh/gitfix.sh) + for url in ${git_list[@]}; do + check_url $url + if [ $? = 0 ]; then + valid_url=$url + echo "使用链接 $url" + break + fi + done +} + +# 下载 gitfix.sh +dl_git_shell() { + if [ ! -f "$git_shell_path" ]; then + touch $git_shell_path + fi + curl -sL --connect-timeout 3 $valid_url > $git_shell_path + cp $git_shell_path $dir_config/gitfix.sh + # 判断是否下载成功 + git_size=$(ls -l $git_shell_path | awk '{print $5}') + if (( $(echo "${git_size} < 100" | bc -l) )); then + echo "gitfix.sh 下载失败" + exit 0 + fi + # 授权 + chmod 755 $git_shell_path +} + +read -p "回车开始执行github连接修复:" Rgit +Rgit=${Rgit:-'y'} + +if [ "${Rgit}" = 'y' -o "${all}" = 1 ]; then + get_valid_git && dl_git_shell + echo "开始执行拉库修复" + bash $git_shell_path +else + echo "已为您跳过操作" +fi + + + # 获取有效 extra.sh 链接 get_valid_extra() { extra_list=(https://git.metauniverse-cn.com/https://raw.githubusercontent.com/yanyuwangluo/VIP/main/Tasks/qlrepo/extra.sh) @@ -109,8 +152,8 @@ dl_extra_shell() { } # extra.sh 设置区设置 set_default_extra() { - echo -e "一、仓库选择" - read -p "直接回车拉取Faker2助力池版仓库,输入3回车拉取Faker3纯净仓库,输入4回车拉取Faker4简洁仓库: " CollectedRepo + echo -e "一、仓库选择\n直接回车拉取Faker2助力池版仓库\n输入3回车拉取Faker3内部互助版仓库\n输入4回车拉取Faker4纯净仓库" + read -p ": " CollectedRepo CollectedRepo=${CollectedRepo:-"2"} # 如果用户直接回车,则默认为 2 sed -i "s/CollectedRepo=(2)/CollectedRepo=(${CollectedRepo})/g" $extra_shell_path } @@ -150,48 +193,6 @@ else fi fi -# 获取有效 gitfix.sh 链接 -get_valid_git() { - git_list=(https://git.metauniverse-cn.com/https://raw.githubusercontent.com/yanyuwangluo/VIP/main/Scripts/sh/gitfix.sh) - for url in ${git_list[@]}; do - check_url $url - if [ $? = 0 ]; then - valid_url=$url - echo "使用链接 $url" - break - fi - done -} - -# 下载 gitfix.sh -dl_git_shell() { - if [ ! -f "$git_shell_path" ]; then - touch $git_shell_path - fi - curl -sL --connect-timeout 3 $valid_url > $git_shell_path - cp $git_shell_path $dir_config/gitfix.sh - # 判断是否下载成功 - git_size=$(ls -l $git_shell_path | awk '{print $5}') - if (( $(echo "${git_size} < 100" | bc -l) )); then - echo "gitfix.sh 下载失败" - exit 0 - fi - # 授权 - chmod 755 $git_shell_path -} - -read -p "回车继续执行github连接修复:" Rgit -Rgit=${Rgit:-'y'} - -if [ "${Rgit}" = 'y' -o "${all}" = 1 ]; then - get_valid_git && dl_git_shell - echo "开始执行拉库修复" - bash $git_shell_path -else - echo "已为您跳过操作" -fi - - # 获取有效 code.sh 链接 get_valid_code() { @@ -233,12 +234,12 @@ set_default_code() { } # 将 task code.sh 添加到定时任务 add_task_code() { - if [ "$(grep -c "code.sh" /ql/config/crontab.list)" != 0 ]; then + if [ "$(grep -c "code.sh" /ql/data/config/crontab.list)" != 0 ]; then echo "您的任务列表中已存在 task:task code.sh" else echo "开始添加 task:task code.sh" # 获取token - token=$(cat /ql/config/auth.json | jq --raw-output .token) + token=$(cat /ql/data/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":"task /ql/config/code.sh","schedule":"*/10 * * * *"}' --compressed 'http://127.0.0.1:5600/api/crons?t=1697961933000' fi } diff --git a/Scripts/sh/ql12.sh b/Scripts/sh/ql12.sh index 149460b..800d09d 100644 --- a/Scripts/sh/ql12.sh +++ b/Scripts/sh/ql12.sh @@ -20,7 +20,6 @@ echo ------------------------------- read -r -p "请输入要安装的青龙版本:" ql if [ ! -n "$ql" ] ;then ql="2.17.9" -# echo "本一键仅支持到2.11.3版本" echo "您设置的当前版本${ql}" else echo "您设置的当前版本${ql}" @@ -344,10 +343,10 @@ if [ "$access" != "2" ]; then log "8.开始青龙内部配置" docker exec -it $CONTAINER_NAME bash -c "$(curl -fsSL https://git.metauniverse-cn.com/https://raw.githubusercontent.com/yanyuwangluo/VIP/main/Scripts/sh/1customCDNN.sh)" else - warn "8.未检测到 token,取消内部配置" + warn "8.未检测到 token,取消内部配置,后续配置去教程看即可" fi else exit 0 fi -log "/n部署完成了,另外Faker教程内有一键安装依赖脚本,按需使用" +log "/n部署完成了,另外Faker教程内有一键安装依赖脚本,请继续安装使用" diff --git a/Tasks/qlrepo/extra.sh b/Tasks/qlrepo/extra.sh index d8f9c9a..697b547 100644 --- a/Tasks/qlrepo/extra.sh +++ b/Tasks/qlrepo/extra.sh @@ -28,13 +28,13 @@ EOF #------ 代码区 ------# # 🌱拉取仓库 CR2(){ - ql repo https://github.com/shufflewzc/faker2.git "jd_|jx_|gua_|jddj_|jdCookie" "activity|backUp" "^jd[^_]|USER|function|utils|sendNotify|ZooFaker_Necklace.js|JDJRValidator_|sign_graphics_validate|ql|JDSignValidator|magic|depend|h5sts" "main" + ql repo https://git.metauniverse-cn.com/https://github.com/shufflewzc/faker2.git "jd_|jx_|gua_|jddj_|jdCookie" "activity|backUp" "^jd[^_]|USER|function|utils|sendNotify|ZooFaker_Necklace.js|JDJRValidator_|sign_graphics_validate|ql|JDSignValidator|magic|depend|h5sts" "main" } CR3(){ - ql repo https://github.com/shufflewzc/faker3.git "jd_|jx_|gua_|jddj_|jdCookie" "activity|backUp" "^jd[^_]|USER|function|utils|sendNotify|ZooFaker_Necklace.js|JDJRValidator_|sign_graphics_validate|ql|JDSignValidator|magic|depend|h5sts" "main" + ql repo https://git.metauniverse-cn.com/https://github.com/shufflewzc/faker3.git "jd_|jx_|gua_|jddj_|jdCookie" "activity|backUp" "^jd[^_]|USER|function|utils|sendNotify|ZooFaker_Necklace.js|JDJRValidator_|sign_graphics_validate|ql|JDSignValidator|magic|depend|h5sts" "main" } CR4(){ - ql repo https://github.com/shufflewzc/faker4.git "jd_|jx_|gua_|jddj_|jdCookie" "activity|backUp" "^jd[^_]|USER|function|utils|sendNotify|ZooFaker_Necklace.js|JDJRValidator_|sign_graphics_validate|ql|JDSignValidator|magic|depend|h5sts" "main" + ql repo https://git.metauniverse-cn.com/https://github.com/shufflewzc/faker4.git "jd_|jx_|gua_|jddj_|jdCookie" "activity|backUp" "^jd[^_]|USER|function|utils|sendNotify|ZooFaker_Necklace.js|JDJRValidator_|sign_graphics_validate|ql|JDSignValidator|magic|depend|h5sts" "main" }