diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index 58b18a4..2a58e3a 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/bin/version b/bin/version index 8e64281..84033e5 100644 --- a/bin/version +++ b/bin/version @@ -1,2 +1,2 @@ GeoIP_v=20201001 -versionsh=1.0.0pre1 +versionsh=versionsh=1.0.0pre1 diff --git a/scripts/clash.sh b/scripts/clash.sh index 38b622a..793e0c8 100644 --- a/scripts/clash.sh +++ b/scripts/clash.sh @@ -111,7 +111,7 @@ start_over(){ clashstart(){ if [ ! -f "$yaml" ];then echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - echo -e "\033[31m没有找到配置文件,请先导入节点/订阅链接!\033[0m" + echo -e "\033[31m没有找到配置文件,请先导入配置文件!\033[0m" clashlink fi if [ -n "$PID" ];then @@ -144,8 +144,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[32m节点过滤\033[0m关键字 \033[47;30m$exclude\033[0m" echo -e " 4 选取\033[33mclash配置规则\033[0m模版" echo -e " 5 选择在线生成服务器" @@ -867,7 +867,7 @@ echo -e " 2 clash\033[33m功能设置\033[0m" echo -e " 3 \033[31m停止\033[0mclash服务" echo -e " 4 $auto1" echo -e " 5 设置\033[33m定时任务\033[0m" -echo -e " 6 导入\033[32m节点/订阅\033[0m链接" +echo -e " 6 导入\033[32m配置文件\033[0m" echo -e " 7 clash\033[31m进阶设置\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 a6636fc..6d95801 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -154,13 +154,9 @@ while [ $i -le 99 ] do echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[44m 遇问题请加TG群反馈:\033[42;30m t.me/clashfm \033[0m" + echo -e "\033[31m本功能依赖第三方网站在线服务实现,脚本本身不提供任何代理服务!033[0m" echo ----------------------------------------------- - echo -e "支持批量导入\033[30;46m Http/Https/Clash \033[0m等格式的订阅链接" - echo -e "以及\033[30;42m Vmess/SSR/SS/Trojan \033[0m等格式的节点链接" - echo -e "自建Trojan节点链接格式为:trojan://密码@host地址:443" - echo ----------------------------------------------- - echo -e "多个较短的链接可以用\033[30;47m | \033[0m号分隔以一次性输入" - echo -e "多个较长的链接可分次输入,支持多达\033[30;47m 99 \033[0m次输入" + echo -e "支持批量导入订阅文件的在线链接" echo ----------------------------------------------- echo -e " 0 \033[31m撤销输入\033[0m" echo -e "回车 \033[32m完成输入\033[0m并\033[33m开始导入\033[0m配置文件!" @@ -188,7 +184,7 @@ do clashlink else echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - echo -e "\033[31m请输入正确的订阅/分享链接!!!\033[0m" + echo -e "\033[31m请输入正确的订阅链接!!!\033[0m" fi done #### @@ -199,11 +195,9 @@ clashlink } getlink2(){ echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -echo -e "\033[30;47m 此功能不明勿用!\033[0m" -echo ----------------------------------------------- -echo -e "\033[33m仅限导入完整clash链接!!!\033[0m" -echo -e "可以使用\033[32m https://acl4ssr.netlify.app \033[0m在线转换" -echo -e "\033[36m导入后如无法运行,请使用【导入节点/订阅链接】功能" +echo -e "\033[33m仅限导入完整clash配置文件链接!!!\033[0m" +echo -e "可以使用\033[32m https://acl4ssr.netlify.app \033[0m在线生成配置文件" +echo -e "\033[36m导入后如无法运行,请使用【导入订阅】功能" echo ----------------------------------------------- echo -e "\033[33m0 返回上级菜单\033[0m" echo -----------------------------------------------