diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index ac50651..673a2eb 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ 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"