From af6922e2daa44fe930bbbca0a789972199936afe Mon Sep 17 00:00:00 2001 From: juewuy Date: Sun, 25 Oct 2020 23:17:17 +0800 Subject: [PATCH] =?UTF-8?q?v1.0.0beta15.6=20~Redir=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9F=BA=E4=BA=8Etproxy=E7=9A=84udp=E4=BB=A3?= =?UTF-8?q?=E7=90=86=20~=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=8A=A8=E7=94=9F?= =?UTF-8?q?=E6=88=90pac=E9=80=BB=E8=BE=91=20~=E5=A2=9E=E5=8A=A0Gnome?= =?UTF-8?q?=E4=BB=A5=E5=8F=8AKDE=E6=A1=8C=E9=9D=A2=E7=9A=84=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E8=AE=BE=E7=BD=AE=E6=9C=AC=E6=9C=BA=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=20~=E4=BF=AE=E5=A4=8D=E5=90=84=E7=A7=8D?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A3=80=E6=B5=8B=E5=A4=B1=E8=B4=A5=E7=9A=84?= =?UTF-8?q?bug=20~=E4=BF=AE=E5=A4=8D=E5=85=B3=E9=97=AD=E6=97=B6=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E7=9A=84bug=20~=E4=BF=AE=E5=A4=8D=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E6=97=B6=E5=90=8C=E6=97=B6=E4=B8=8B=E8=BD=BD=E5=A4=9A=E6=AC=A1?= =?UTF-8?q?=E7=9A=84bug=20~=E4=BF=AE=E5=A4=8D=E6=96=B0=E6=89=8B=E5=BC=95?= =?UTF-8?q?=E5=AF=BC=E6=8A=A5=E9=94=99=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.sh | 1 + scripts/clash.sh | 30 +++++++++++++++++++++--------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/install.sh b/install.sh index 8959ab3..21a9191 100644 --- a/install.sh +++ b/install.sh @@ -185,4 +185,5 @@ if [ -n "$clashdir" ];then fi else setdir + install fi diff --git a/scripts/clash.sh b/scripts/clash.sh index 283e636..36353d6 100644 --- a/scripts/clash.sh +++ b/scripts/clash.sh @@ -111,7 +111,7 @@ function FindProxyForURL(url, host) { ) return "DIRECT"; else - return "PROXY $host:$mix_port; DIRECT;" + return "SOCKS5 $host:$mix_port; PROXY $host:$mix_port; DIRECT;" } EOF [ ! -d $clashdir/ui ] && mkdir -p $clashdir/ui @@ -258,7 +258,7 @@ setdns(){ fi elif [ "$num" = 2 ]; then read -p "请输入新的DNS > " dns_fallback - dns_fallback=$(echo $dns_nameserver | sed 's/|/\,\ /') + dns_fallback=$(echo $dns_fallback | sed 's/|/\,\ /') if [ -n "$dns_fallback" ]; then sed -i "/dns_fallback*/"d $ccfg sed -i "1i\dns_fallback=\'$dns_fallback\'" $ccfg @@ -462,27 +462,39 @@ clashcfg(){ elif [ "$num" = 1 ]; then redir_mod=Redir模式 elif [ "$num" = 2 ]; then - if [ "$clashcore" = "clash" ] || [ "$clashcore" = "clashr" ];then + modinfo tun >/dev/null 2>&1 + if [ "$?" != 0 ];then + echo ----------------------------------------------- + echo -e "\033[31m当前设备内核不支持开启Tun/混合模式，请使用其他模式！\033[0m" + set_redir_mod + elif [ "$clashcore" = "clash" ] || [ "$clashcore" = "clashr" ];then echo ----------------------------------------------- echo -e "\033[31m当前核心不支持开启Tun模式！请先切换clash核心！！！\033[0m" clashcfg + else + redir_mod=Tun模式 + dns_mod=fake-ip fi - redir_mod=Tun模式 - dns_mod=fake-ip elif [ "$num" = 3 ]; then - if [ "$clashcore" = "clash" ] || [ "$clashcore" = "clashr" ];then + modinfo tun >/dev/null 2>&1 + if [ "$?" != 0 ];then + echo ----------------------------------------------- + echo -e "\033[31m当前设备内核不支持开启Tun/混合模式，请使用其他模式！\033[0m" + set_redir_mod + elif [ "$clashcore" = "clash" ] || [ "$clashcore" = "clashr" ];then echo ----------------------------------------------- echo -e "\033[31m当前核心不支持开启Tun模式！请先切换clash核心！！！\033[0m" clashcfg + else + redir_mod=混合模式 fi - redir_mod=混合模式 elif [ "$num" = 4 ]; then redir_mod=纯净模式 echo ----------------------------------------------- - echo -e "\033[32m已经设置为纯净模式！\033[0m" echo -e "\033[33m当前模式需要手动在设备WiFi或应用中配置HTTP或sock5代理\033[0m" echo -e "HTTP/SOCK5代理服务器地址：\033[30;47m$host\033[0m;端口均为：\033[30;47m$mix_port\033[0m" - echo -e "也可以使用更便捷的PAC自动代理，PAC代理链接为：\033[30;47m http://$host:$mix_port/ui/pac \033[0m" + echo -e "也可以使用更便捷的PAC自动代理，PAC代理链接为：" + echo -e "\033[30;47m http://$host:$db_port/ui/pac \033[0m" echo -e "PAC的使用教程请参考：\033[4;32mhttps://juewuy.github.io/ehRUeewcv\033[0m" sleep 2 else