From 09432eee0148016ddfb7cf1f003260db850c3a7e Mon Sep 17 00:00:00 2001 From: juewuy Date: Thu, 3 Dec 2020 13:06:40 +0800 Subject: [PATCH] =?UTF-8?q?v1.0.0beta17.3=20~=E4=BF=AE=E5=A4=8D=E5=81=B6?= =?UTF-8?q?=E5=B0=94=E6=A3=80=E6=B5=8B=E6=9B=B4=E6=96=B0=E5=87=BA=E9=94=99?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/clashfm.tar.gz | Bin 25214 -> 25214 bytes install.sh | 2 +- scripts/getdate.sh | 13 ++++++------- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index c87df6c82b7223cfa25277f3c44ee00af10de68f..9bf85eca7e21fa768e550f4fb46e321535840b9b 100644 GIT binary patch delta 18 Zcmex&gz?`IMt1pb4h~D!{TtcKlK@HC2G#%o delta 18 acmex&gz?`IMt1pb4vrh5yEd|yCjkIXc?W<1 diff --git a/install.sh b/install.sh index 3517f45..daae85d 100644 --- a/install.sh +++ b/install.sh @@ -41,7 +41,7 @@ if [ "$test" -gt 0 ];then [ "$test" -eq 3 ] && url="http://192.168.123.90:8080/clash-for-Miwifi" else webget /tmp/clashrelease $url@master/bin/release_version echoon rediroff 2>/tmp/clashrelease - release_new=$(cat /tmp/clashrelease | head -1) + [ "$result" = "200" ] && release_new=$(cat /tmp/clashrelease | head -1) [ -z "$release_new" ] && release_new=master url=$url@$release_new fi diff --git a/scripts/getdate.sh b/scripts/getdate.sh index 1fd448b..c51af9c 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -186,8 +186,9 @@ getlink(){ echo ----------------------------------------------- echo -e "\033[44m 遇问题请加TG群反馈：\033[42;30m t.me/clashfm \033[0m" echo -e "\033[31m本功能依赖第三方网站在线服务实现，脚本本身不提供任何代理服务！\033[0m" + echo -e "\033[31m严禁使用本脚本从事非法活动，否则一切后果请自负！\033[0m" echo ----------------------------------------------- - echo -e "支持批量导入订阅文件的在线链接" + echo -e "支持批量导入订阅链接、分享链接" echo ----------------------------------------------- echo -e " 0 \033[31m撤销输入\033[0m" echo -e "回车 \033[32m完成输入\033[0m并\033[33m开始导入\033[0m配置文件！" @@ -729,12 +730,12 @@ checkupdate(){ if [ -z "$release_new" ];then if [ "$update_url" = "https://cdn.jsdelivr.net/gh/juewuy/ShellClash" ];then webget /tmp/clashrelease $update_url@master/bin/release_version echoon rediroff 2>/tmp/clashrelease - release_new=$(cat /tmp/clashrelease | head -1) + [ "$result" = "200" ] && release_new=$(cat /tmp/clashrelease | head -1) [ -z "$release_new" ] && release_new=master update_url=$update_url@$release_new fi webget /tmp/clashversion $update_url/bin/version echooff - [ "$result" = "200" ] && source /tmp/clashversion || echo -e "\033[31m检查更新失败！请检查网络连接或更换安装源！\033[0m" + [ "$result" = "200" ] && source /tmp/clashversion || echo -e "\033[31m检查更新失败！请检查网络连接或切换安装源！\033[0m" [ -z "$release_new" ] && release_new=$versionsh rm -rf /tmp/clashversion rm -rf /tmp/clashrelease @@ -831,8 +832,6 @@ exit; } #新手引导 userguide(){ - - whichmod(){ echo ----------------------------------------------- echo -e "\033[33m是否需要代理UDP流量(主要用于游戏)？ \033[0m" @@ -840,7 +839,7 @@ userguide(){ echo -e " 1 \033[0m不代理UDP流量(可能会导致一部分游戏/应用无法连接)\033[0m" modinfo tun >/dev/null 2>&1 && [ "$?" = 0 ] && \ echo -e " 2 \033[0m使用Tun虚拟网卡代理UDP流量(更低的延迟但更多的CPU消耗)\033[0m" || \ - echo -e " 0 \033[0m使用Tun模式(你的设备不支持此模式，如为虚拟机运行请调整虚拟网卡设置)\033[0m" + echo -e " - \033[0m使用Tun模式(你的设备不支持此模式，如为虚拟机运行请调整虚拟网卡设置)\033[0m" [ -n "$(iptables -j TPROXY 2>&1 | grep 'on-port')" ] && \ echo -e " 3 \033[0m使用Tproxy模式代理UDP流量(较低CPU消耗但更高的延迟)033[0m" echo ----------------------------------------------- @@ -868,7 +867,7 @@ userguide(){ echo -e "\033[0m(你之后依然可以在设置中更改各种配置)\033[0m" echo ----------------------------------------------- echo -e " 1 \033[32m各类路由设备\033[0m，配置局域网透明路由" - echo -e " 2 \033[36mLinux桌面系统\033[0m，仅配置本机路由" + echo -e " 2 \033[36m桌面版Linux系统\033[0m，仅配置本机路由" echo -e " 3 \033[32m服务器Linux系统\033[0m，仅配置本机路由" echo -e " 4 \033[36m多功能设备\033[0m，配置本机及局域网路由" echo -----------------------------------------------