diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index ea7d18f..8b959bd 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/bin/version b/bin/version index e340b73..9d6ab73 100644 --- a/bin/version +++ b/bin/version @@ -1,4 +1,4 @@ clash_v=1.6.0 clashpre_v=2021.05.08 GeoIP_v=20210611 -versionsh=1.3.12 +versionsh=1.3.13 diff --git a/scripts/getdate.sh b/scripts/getdate.sh index c92f367..3a18a5e 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -868,7 +868,7 @@ userguide(){ echo ----------------------------------------------- echo -e "\033[33m是否需要代理UDP流量(主要用于游戏)? \033[0m" echo ----------------------------------------------- - echo -e " 1 \033[33m不代理UDP流量\033[0m(可能会导致一部分游戏/应用无法连接)" + echo -e " 1 \033[33m不代理UDP流量\033[0m(可能会导致一部分外服游戏/应用无法连接)" ip tuntap >/dev/null 2>&1 && [ "$?" = 0 ] && \ echo -e " 2 \033[32m使用Tun虚拟网卡\033[0m代理UDP流量(更低的延迟但更多的CPU消耗)" || \ echo -e " - \033[0m使用Tun模式(你的设备不支持此模式,如为虚拟机运行请调整虚拟网卡设置)\033[0m" @@ -898,7 +898,7 @@ userguide(){ echo -e "\033[33m请先选择你的使用环境: \033[0m" echo -e "\033[0m(你之后依然可以在设置中更改各种配置)\033[0m" echo ----------------------------------------------- - echo -e " 1 \033[32m主(旁)路由\033[0m" + echo -e " 1 \033[32m主路由或旁路由\033[0m" echo -e " 2 \033[36mLinux本机代理\033[0m" echo ----------------------------------------------- read -p "请输入对应数字 > " num diff --git a/scripts/start.sh b/scripts/start.sh index 8605d62..47f6f17 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -66,10 +66,10 @@ webget(){ [ "$4" = "rediroff" ] && redirect='--max-redirect=0' || redirect='' [ "$5" = "skipceroff" ] && certificate='' || certificate='--no-check-certificate' timeout='--timeout=3 -t 2' + [ -n "$6" ] && agent='--user-agent="clash"' fi [ "$3" = "echoon" ] && progress='' [ "$3" = "echooff" ] && progress='-q' - [ -n "$6" ] && agent='--user-agent="clash"' wget -Y on $agent $progress $redirect $certificate $timeout -O "$1" "$2" if [ "$?" != "0" ];then wget -Y off $agent $progress $redirect $certificate $timeout -O "$1" "$2"