xm/ShellCrash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

~修复IP地址库判定问题

Browse Source 
~增加基于doh的默认dns配置
This commit is contained in:
juewuy
2022-05-27 21:24:06 +08:00
parent e07fa3b14f
commit 1078ad156f
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/getdate.sh
View File

@@ -517,7 +517,7 @@ setcore(){
getgeo(){ getgeo(){
echo ----------------------------------------------- echo -----------------------------------------------
echo 正在从服务器获取数据库文件………… echo 正在从服务器获取数据库文件…………
$clashdir/start.sh webget /tmp/$geoname $update_url/bin/$geotype $clashdir/start.sh webget /tmp/$geoname $update_url/bin/$geo_type
if [ "$?" = "1" ];then if [ "$?" = "1" ];then
echo ----------------------------------------------- echo -----------------------------------------------
echo -e "\033[31m文件下载失败！\033[0m" echo -e "\033[31m文件下载失败！\033[0m"
@@ -528,13 +528,15 @@ getgeo(){
echo -e "\033[32mGeoIP/CN_IP数据库文件下载成功！\033[0m" echo -e "\033[32mGeoIP/CN_IP数据库文件下载成功！\033[0m"
Geo_v=$GeoIP_v Geo_v=$GeoIP_v
setconfig Geo_v $GeoIP_v setconfig Geo_v $GeoIP_v
setconfig geotype $geotype if [ "$geoname" = "Country.mmdb" ];then
geotype=$geo_type
setconfig geotype $geotype
fi
fi fi
} }
setgeo(){ setgeo(){
echo ----------------------------------------------- echo -----------------------------------------------
[ "$geotype" = "cn_mini.mmdb" ] && geo_type=精简版 || geo_type=全球版 [ "$geotype" = "cn_mini.mmdb" ] && echo -e "当前使用的是\033[47;30m精简版数据库\033[0m" || echo -e "当前使用的是\033[47;30m全球版数据库\033[0m"
[ -n "$geo_type" ] && echo -e "当前使用的是\033[47;30m$geo_type数据库\033[0m"
echo -e "\033[36m请选择需要更新/切换的GeoIP/CN_IP数据库：\033[0m" echo -e "\033[36m请选择需要更新/切换的GeoIP/CN_IP数据库：\033[0m"
echo ----------------------------------------------- echo -----------------------------------------------
echo -e " 1 由\033[32malecthw\033[0m提供的全球版GeoIP数据库(约6mb)" echo -e " 1 由\033[32malecthw\033[0m提供的全球版GeoIP数据库(约6mb)"
@@ -546,16 +548,16 @@ setgeo(){
echo ----------------------------------------------- echo -----------------------------------------------
read -p "请输入对应数字 > " num read -p "请输入对应数字 > " num
if [ "$num" = '1' ]; then if [ "$num" = '1' ]; then
geotype=Country.mmdb geo_type=Country.mmdb
geoname=Country.mmdb geoname=Country.mmdb
getgeo getgeo
elif [ "$num" = '2' ]; then elif [ "$num" = '2' ]; then
geotype=cn_mini.mmdb geo_type=cn_mini.mmdb
geoname=Country.mmdb geoname=Country.mmdb
getgeo getgeo
elif [ "$num" = '3' ]; then elif [ "$num" = '3' ]; then
if [ "$cn_ip_route" = "已开启" ]; then if [ "$cn_ip_route" = "已开启" ]; then
geotype=china_ip_list.txt geo_type=china_ip_list.txt
geoname=cn_ip.txt geoname=cn_ip.txt
getgeo getgeo
else else
@@ -564,7 +566,7 @@ setgeo(){
sleep 1 sleep 1
fi fi
elif [ "$num" = '4' ]; then elif [ "$num" = '4' ]; then
geotype=geosite.dat geo_type=geosite.dat
geoname=geosite.dat geoname=geosite.dat
getgeo getgeo
else else
@@ -1149,4 +1151,4 @@ testcommand(){
errornum errornum
clashsh clashsh
fi fi
} }

2
scripts/start.sh
View File

@@ -300,7 +300,7 @@ modify_yaml(){
fi fi
exper='experimental: {ignore-resolve-fail: true, interface-name: en0}' exper='experimental: {ignore-resolve-fail: true, interface-name: en0}'
#dns配置 #dns配置
dns_default='114.114.114.114, 223.5.5.5' dns_default='114.114.114.114, 223.5.5.5, https://1.0.0.1/dns-query, https://223.5.5.5/dns-query'
if [ -f $clashdir/fake_ip_filter ];then if [ -f $clashdir/fake_ip_filter ];then
while read line;do while read line;do
fake_ft_ad=$fake_ft_ad,\"$line\" fake_ft_ad=$fake_ft_ad,\"$line\"