~修复部分路由设备会出现双进程的bug
~修复GeoSite大小写文件名导致额外下载的bug
This commit is contained in:
juewuy
2023-01-25 16:35:14 +08:00
parent 3f2485dbe4
commit ac0e024787
4 changed files with 7 additions and 7 deletions

Binary file not shown.

Binary file not shown.

View File

@@ -545,7 +545,7 @@ setgeo(){
fi
elif [ "$num" = '5' ]; then
geotype=geosite.dat
geoname=geosite.dat
geoname=GeoSite.dat
getgeo
else
update

View File

@@ -1150,14 +1150,14 @@ bfstart(){
[ "$?" = 1 ] && restore=true || restore=false
#生成pac文件
catpac
#预下载Geosite数据库
if [ "$clashcore" = "clash.meta" ] && [ ! -f $bindir/geosite.dat ] && [ -n "$(cat $clashdir/config.yaml|grep -Ei 'geosite')" ];then
if [ -f $clashdir/geosite.dat ];then
mv $clashdir/geosite.dat $bindir/geosite.dat
#预下载GeoSite数据库
if [ "$clashcore" = "clash.meta" ] && [ ! -f $bindir/GeoSite.dat ] && [ -n "$(cat $clashdir/config.yaml|grep -Ei 'geosite')" ];then
if [ -f $clashdir/*eo*ite.dat ];then
mv -f $clashdir/*eo*ite.dat $bindir/GeoSite.dat
else
logger "未找到geosite数据库正在下载" 33
$0 webget $bindir/geosite.dat $update_url/bin/geosite.dat
[ "$?" = "1" ] && rm -rf $bindir/geosite.dat && logger "数据库下载失败,已退出!" 31 && exit 1
$0 webget $bindir/GeoSite.dat $update_url/bin/geosite.dat
[ "$?" = "1" ] && rm -rf $bindir/GeoSite.dat && logger "数据库下载失败,已退出!" 31 && exit 1
fi
fi
#本机代理准备