Austin/ShellCrash
1
0
Fork 0
mirror of https://github.com/juewuy/ShellCrash.git synced 2024-11-16 03:32:34 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

v1.0.0beta15.6

Browse Source 
~Redir模式增加基于tproxy的udp代理
~增加自动生成pac逻辑
~增加Gnome以及KDE桌面的自动设置本机代理功能
~修复各种更新检测失败的bug
~修复关闭时报错的bug
~修复安装时同时下载多次的bug
~修复新手引导报错的bug
This commit is contained in:
juewuy 2020-10-25 23:17:17 +08:00
parent 81d97502e1
commit af6922e2da
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
install.sh
View File

@ -185,4 +185,5 @@ if [ -n "$clashdir" ];then
fi
else
setdir
install
fi

28
scripts/clash.sh
View File

@ -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
fi
else
redir_mod=Tun模式
dns_mod=fake-ip
fi
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
fi
else
redir_mod=混合模式
fi
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