Skip to content

Commit

Permalink
v1.0.0beta18.7
Browse files Browse the repository at this point in the history
~同步最新geoip数据库文件
~优化Tun模式提示信息
~增加acl4ssr谷歌精细分组规则
  • Loading branch information
juewuy committed Feb 8, 2021
1 parent a194980 commit c57fd34
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 10 deletions.
Binary file modified bin/Country.mmdb
Binary file not shown.
Binary file modified bin/cn_mini.mmdb
Binary file not shown.
2 changes: 1 addition & 1 deletion bin/version
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
clash_v=1.3.5
clashpre_v=2020.12.27
GeoIP_v=20210122
versionsh=1.0.0beta18.6
GeoIP_v=20210208
2 changes: 1 addition & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ echo "***********************************************"
#检查root权限
if [ "$USER" != "root" ];then
echo 当前用户:$USER
$echo "\033[31m请尽量使用root用户执行安装!\033[0m"
$echo "\033[31m请尽量使用root用户(但绝对不要使用sudo命令!)执行安装!\033[0m"
echo -----------------------------------------------
read -p "仍要安装?可能会产生大量未知错误!(1/0) > " res
[ "$res" != "1" ] && exit
Expand Down
12 changes: 6 additions & 6 deletions scripts/clash.sh
Original file line number Diff line number Diff line change
Expand Up @@ -521,12 +521,12 @@ clashcfg(){
echo -e " 1 Redir模式:CPU以及内存\033[33m占用较低\033[0m"
echo -e " 但\033[31m不支持UDP\033[0m流量转发"
echo -e " 适合\033[32m非游戏用户\033[0m使用"
echo -e " 2 Tun模式: \033[33m支持UDP转发\033[0m且延迟最低"
echo -e " \033[31mCPU占用极高\033[0m,只支持fake-ip模式"
echo -e " 适合\033[32m游戏用户、非大流量用户\033[0m"
echo -e " 3 混合模式: 使用redir转发TCP,Tun转发UPD"
echo -e " 2 混合模式: 使用redir转发TCP,Tun转发UPD"
echo -e " \033[33m速度较快\033[0m,\033[31m内存占用略高\033[0m"
echo -e " 适合\033[32m游戏用户、综合用户\033[0m"
echo -e " 3 Tun模式: \033[33m支持UDP转发\033[0m且延迟最低"
echo -e " \033[31mCPU占用极高\033[0m,只支持fake-ip模式"
echo -e " \033[33m如非必要不推荐使用\033[0m"
echo -e " 4 纯净模式: 不设置iptables静态路由"
echo -e " 必须\033[33m手动配置\033[0mhttp/sock5代理"
echo -e " 或使用内置的PAC文件配置代理"
Expand All @@ -539,7 +539,7 @@ clashcfg(){
elif [ "$num" = 1 ]; then
redir_mod=Redir模式
set_redir_config
elif [ "$num" = 2 ]; then
elif [ "$num" = 3 ]; then
modinfo tun >/dev/null 2>&1
if [ "$?" != 0 ];then
echo -----------------------------------------------
Expand All @@ -561,7 +561,7 @@ clashcfg(){
dns_mod=fake-ip
set_redir_config
fi
elif [ "$num" = 3 ]; then
elif [ "$num" = 2 ]; then
modinfo tun >/dev/null 2>&1
if [ "$?" != 0 ];then
echo -e "\033[31m当前设备内核可能不支持开启Tun/混合模式!\033[0m"
Expand Down
5 changes: 3 additions & 2 deletions scripts/getdate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,15 @@ linkconfig(){
echo 11 李哥规则-墙洞专用
echo 12 基础规则-仅Geoip CN+Final
echo 13 网易云解锁-仅规则分组
echo 14 ACL4SSR重度全分组+谷歌优化
echo -----------------------------------------------
echo 0 返回上级菜单
read -p "请输入对应数字 > " num
if [ -z "$num" ] || [ "$num" -gt 13 ];then
if [ -z "$num" ] || [ "$num" -gt 14 ];then
errornum
elif [ "$num" = 0 ];then
echo
elif [ "$num" -le 13 ];then
elif [ "$num" -le 14 ];then
#将对应标记值写入mark
rule_link=$num
setconfig rule_link $rule_link
Expand Down
1 change: 1 addition & 0 deletions scripts/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ https://gist.githubusercontent.com/tindy2013/1fa08640a9088ac8652dbd40c5d2715b/ra
https://gist.githubusercontent.com/tindy2013/1fa08640a9088ac8652dbd40c5d2715b/raw/dlercloud_lige_platinum.ini
https://subconverter.oss-ap-southeast-1.aliyuncs.com/Rules/RemoteConfig/special/basic.ini
https://subconverter.oss-ap-southeast-1.aliyuncs.com/Rules/RemoteConfig/special/netease.ini
https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Full_Google.ini
EOF`
#如果传来的是Url链接则合成Https链接,否则直接使用Https链接
if [ -z "$Https" ];then
Expand Down

0 comments on commit c57fd34

Please sign in to comment.