From ee4ec97d324d9b8c0f33a89c6aff351bb988f70a Mon Sep 17 00:00:00 2001 From: juewuy Date: Wed, 19 Aug 2020 14:29:55 +0800 Subject: [PATCH] =?UTF-8?q?v0.9.7=20~=E4=BC=98=E5=8C=96=E4=BA=86=E8=AE=A2?= =?UTF-8?q?=E9=98=85=E9=93=BE=E6=8E=A5=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=20~=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=AF=B9=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=9A=84=E5=8A=A0=E5=AF=86=E6=96=B9=E5=BC=8F=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=20~=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=AF=B9=E4=B8=8D?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=9A=84=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/clashfm.tar.gz | Bin 12651 -> 12818 bytes bin/version | 2 +- scripts/clash.sh | 6 +++--- scripts/getdate.sh | 34 +++++++++++++++++++++++++++------- 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index ac5065101278db9a5fe50f813c5523572b9be07a..673a2eb24bb663100530f5f8bc32e4b061e197f8 100644 GIT binary patch literal 12818 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 ZY~K0L`Oo>!`Om-p^9N%GadZIa006SbrC$I5 diff --git a/bin/version b/bin/version index b0a5886..2b4fb38 100644 --- a/bin/version +++ b/bin/version @@ -1,2 +1,2 @@ GeoIP_v=20200817 -versionsh=0.9.6 +versionsh=0.9.7 diff --git a/scripts/clash.sh b/scripts/clash.sh index 724107d..cc5d412 100644 --- a/scripts/clash.sh +++ b/scripts/clash.sh @@ -125,8 +125,8 @@ fi echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[30;47m 欢迎使用订阅功能!\033[0m" echo ----------------------------------------------- -echo -e " 1 输入\033[36m节点/订阅\033[0m链接" -echo -e " 2 输入完整clash规则链接" +echo -e " 1 导入\033[36m节点/订阅\033[0m链接" +echo -e " 2 使用完整clash规则链接" echo -e " 3 选取\033[33m代理规则\033[0m模版" echo -e " 4 选择配置生成服务器" echo -e " 5 \033[36m还原\033[0m配置文件" @@ -749,7 +749,7 @@ echo -e " 1 \033[32m启动/重启\033[0mclash服务" echo -e " 2 clash\033[33m高级设置\033[0m" echo -e " 3 \033[31m停止\033[0mclash服务" echo -e " 4 $auto1" -echo -e " 5 设置定时任务" +echo -e " 5 设置\033[33m定时任务\033[0m" echo -e " 6 导入\033[32m节点/订阅\033[0m链接" echo -e " 8 \033[35m测试菜单\033[0m" echo -e " 9 \033[36m更新/卸载\033[0m" diff --git a/scripts/getdate.sh b/scripts/getdate.sh index 47e7191..3724042 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -51,7 +51,9 @@ if [ "$result" != "200" ];then echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo if [ -z $markhttp ];then - exit; + echo 请尝试使用导入节点/链接功能! + getlink + else read -p "是否更换后端地址后重试?[1/0] > " res if [ "$res" = '1' ]; then @@ -69,6 +71,24 @@ if [ "$result" != "200" ];then fi else if cat $yamlnew | grep ', server:' >/dev/null;then + #检测旧格式 + if cat $yamlnew | grep '^proxy:' >/dev/null;then + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + echo -e "\033[31m已经停止对旧格式配置文件的支持!!!\033[0m" + echo -e "请使用新格式或者使用\033[32m导入节点/订阅\033[0m功能!" + sleep 2 + clashlink + fi + #检测不支持的加密协议 + if cat $yamlnew | grep 'cipher: chacha20,' >/dev/null;then + if [ "$clashcore" = "clash" -o "$clashcore" = "clashpre" ];then + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + echo -e "\033[31m当前核心:$clashcore不支持chacha20加密!!!\033[0m" + echo -e "请更换使用clashR核心!!!" + sleep 2 + getcore + fi + fi #替换文件 if [ -f $yaml ];then mv $yaml $yaml.bak @@ -98,9 +118,9 @@ else sleep 1 clashsh else - echo -e "\033[31mclash服务启动失败!请利用测试菜单排查问题!\033[0m" - sleep 1 - clashsh + echo -e "\033[31mclash服务启动失败!请查看报错信息!\033[0m" + $clashdir/clash -d $clashdir & { sleep 3 ; kill $! & } + exit; fi fi else @@ -192,10 +212,10 @@ fi } getlink2(){ echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -echo -e "\033[44m 遇问题请加TG群反馈:\033[42;30m t.me/clashfm \033[0m" +echo -e "\033[30;47m 此功能不明勿用,出问题自行解决!\033[0m" echo ----------------------------------------------- -echo -e "\033[33m仅支持导入可直接在clash中使用的完整订阅链接" -echo -e "\033[36m非完整链接请使用【导入节点/订阅链接】功能" +echo -e "\033[33m仅限导入完整clash链接!!!" +echo -e "\033[36m导入后如无法运行,请使用【导入节点/订阅链接】功能" echo -e "\033[31m注意如节点使用了chacha20加密协议,需将核心更新为clashr核心\033[0m" echo ----------------------------------------------- echo -e "\033[33m0 返回上级目录!\033[0m"