diff --git a/bin/Country.mmdb b/bin/Country.mmdb index 2abd2d2..687b9bc 100644 Binary files a/bin/Country.mmdb and b/bin/Country.mmdb differ diff --git a/bin/clash/clash-linux-386 b/bin/clash/clash-linux-386 index 4b092e2..1f3beb2 100644 Binary files a/bin/clash/clash-linux-386 and b/bin/clash/clash-linux-386 differ diff --git a/bin/clash/clash-linux-amd64 b/bin/clash/clash-linux-amd64 index 6353a64..a329c54 100644 Binary files a/bin/clash/clash-linux-amd64 and b/bin/clash/clash-linux-amd64 differ diff --git a/bin/clash/clash-linux-armv5 b/bin/clash/clash-linux-armv5 index 03e839a..d0fde20 100644 Binary files a/bin/clash/clash-linux-armv5 and b/bin/clash/clash-linux-armv5 differ diff --git a/bin/clash/clash-linux-armv7 b/bin/clash/clash-linux-armv7 index 7c1956f..7ff3b14 100644 Binary files a/bin/clash/clash-linux-armv7 and b/bin/clash/clash-linux-armv7 differ diff --git a/bin/clash/clash-linux-armv8 b/bin/clash/clash-linux-armv8 index 87e5b71..b817c03 100644 Binary files a/bin/clash/clash-linux-armv8 and b/bin/clash/clash-linux-armv8 differ diff --git a/bin/clash/clash-linux-mips-softfloat b/bin/clash/clash-linux-mips-softfloat index b3376a9..7f269f2 100644 Binary files a/bin/clash/clash-linux-mips-softfloat and b/bin/clash/clash-linux-mips-softfloat differ diff --git a/bin/clash/clash-linux-mipsle-hardfloat b/bin/clash/clash-linux-mipsle-hardfloat index 3168f5f..46e88e6 100644 Binary files a/bin/clash/clash-linux-mipsle-hardfloat and b/bin/clash/clash-linux-mipsle-hardfloat differ diff --git a/bin/clash/clash-linux-mipsle-softfloat b/bin/clash/clash-linux-mipsle-softfloat index 6ab867d..0dedf1a 100644 Binary files a/bin/clash/clash-linux-mipsle-softfloat and b/bin/clash/clash-linux-mipsle-softfloat differ diff --git a/bin/clashdb.tar.gz b/bin/clashdb.tar.gz index a719827..1dd8ad8 100644 Binary files a/bin/clashdb.tar.gz and b/bin/clashdb.tar.gz differ diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index 6cb8af5..dc4d3b2 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/bin/clashpre/clash-linux-386 b/bin/clashpre/clash-linux-386 index d75d700..5db1080 100644 Binary files a/bin/clashpre/clash-linux-386 and b/bin/clashpre/clash-linux-386 differ diff --git a/bin/clashpre/clash-linux-amd64 b/bin/clashpre/clash-linux-amd64 index a725775..3c893e4 100644 Binary files a/bin/clashpre/clash-linux-amd64 and b/bin/clashpre/clash-linux-amd64 differ diff --git a/bin/clashpre/clash-linux-armv5 b/bin/clashpre/clash-linux-armv5 index 9937839..a786894 100644 Binary files a/bin/clashpre/clash-linux-armv5 and b/bin/clashpre/clash-linux-armv5 differ diff --git a/bin/clashpre/clash-linux-armv7 b/bin/clashpre/clash-linux-armv7 index 5fab281..9d1d791 100644 Binary files a/bin/clashpre/clash-linux-armv7 and b/bin/clashpre/clash-linux-armv7 differ diff --git a/bin/clashpre/clash-linux-armv8 b/bin/clashpre/clash-linux-armv8 index 322a55a..f4f42b2 100644 Binary files a/bin/clashpre/clash-linux-armv8 and b/bin/clashpre/clash-linux-armv8 differ diff --git a/bin/clashpre/clash-linux-mips-softfloat b/bin/clashpre/clash-linux-mips-softfloat index c50ced0..a322f5c 100644 Binary files a/bin/clashpre/clash-linux-mips-softfloat and b/bin/clashpre/clash-linux-mips-softfloat differ diff --git a/bin/clashpre/clash-linux-mipsle-hardfloat b/bin/clashpre/clash-linux-mipsle-hardfloat index 76cacdc..89e862e 100644 Binary files a/bin/clashpre/clash-linux-mipsle-hardfloat and b/bin/clashpre/clash-linux-mipsle-hardfloat differ diff --git a/bin/clashpre/clash-linux-mipsle-softfloat b/bin/clashpre/clash-linux-mipsle-softfloat index d6898bd..34f85c8 100644 Binary files a/bin/clashpre/clash-linux-mipsle-softfloat and b/bin/clashpre/clash-linux-mipsle-softfloat differ diff --git a/bin/cn_mini.mmdb b/bin/cn_mini.mmdb index 5bc5c80..1a2c886 100644 Binary files a/bin/cn_mini.mmdb and b/bin/cn_mini.mmdb differ diff --git a/bin/version b/bin/version index 8eb6ff6..b6d5e9f 100644 --- a/bin/version +++ b/bin/version @@ -1,4 +1,4 @@ -GeoIP_v=20210219 -clash_v=1.4.1 -clashpre_v=2021.02.21 -versionsh=1.1.4 +clash_v=1.4.2 +clashpre_v=2021.03.10 +GeoIP_v=20210312 +versionsh=1.1.5 diff --git a/bin/yacd.tar.gz b/bin/yacd.tar.gz index ecfa3d9..3e7d8f3 100644 Binary files a/bin/yacd.tar.gz and b/bin/yacd.tar.gz differ diff --git a/scripts/getdate.sh b/scripts/getdate.sh index af304fd..52ebf05 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -932,6 +932,15 @@ userguide(){ read -p "是否下载并安装根证书?(1/0) > " res [ "$res" = 1 ] && checkupdate && getcrt fi + #设置加密DNS + webget /tmp/ssl_test https://baidu.com echooff rediron skipceroff + if [ "$result" = "200" ];then + dns_nameserver='https://223.5.5.5/dns-query, https://doh.pub/dns-query, tls://dns.rubyfish.cn:853' + dns_fallback='https://1.0.0.1/dns-query, https://8.8.4.4/dns-query, https://doh.opendns.com/dns-query' + setconfig dns_nameserver \'"$dns_nameserver"\' + setconfig dns_fallback \'"$dns_fallback"\' + fi + rm -rf /tmp/ssl_test #提示导入订阅或者配置文件 echo ----------------------------------------------- echo -e "\033[32m是否导入配置文件?\033[0m(这是运行前的最后一步)" diff --git a/scripts/start.sh b/scripts/start.sh index d28d9b7..a41270f 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -270,13 +270,13 @@ EOF #合并文件 cut -c 1- $tmpdir/set.yaml $yaml_user $tmpdir/proxy.yaml > $tmpdir/config.yaml #插入自定义规则 + sed -i "/#自定义规则/d" $tmpdir/config.yaml if [ -f $clashdir/rules.yaml ];then while read line;do - [ -z "$(echo "$line" | grep '#')" ] && \ + [ -z "$(echo "$line " | grep '#')" ] && \ [ -n "$(echo "$line" | grep '\-\ ')" ] && \ line=$(echo "$line" | sed 's#/#\\/#') && \ - sed -i "/$line/d" $tmpdir/config.yaml && \ - sed -i "/^rules:/a\ $line" $tmpdir/config.yaml + sed -i "/^rules:/a\ $line #自定义规则" $tmpdir/config.yaml done < $clashdir/rules.yaml fi #如果没有使用小闪存模式