Merge branch 'dev' into nft-tun

# Conflicts:
#	scripts/init.sh

.github/workflows/bin_update.yml

@@ -113,8 +113,7 @@ jobs:
         curl -kfSL -o geodata/srs_geoip_cn.srs https://raw.githubusercontent.com/SagerNet/sing-geoip/rule-set/geoip-cn.srs
         curl -kfSL -o geodata/srs_geosite_cn.srs https://raw.githubusercontent.com/SagerNet/sing-geosite/rule-set/geosite-geolocation-cn.srs
         curl -kfSL -o fix/ca-certificates.crt https://raw.githubusercontent.com/P3TERX/ca-certificates.crt/download/ca-certificates.crt
-        sed -i '/GeoIP_v*/'d version
+        sed -i "s/GeoIP_v=.*/GeoIP_v=$(date '+%Y%m%d)/" version #修改版本号
-        echo GeoIP_v=`date '+%Y%m%d'` >> version
         echo 数据库及根证书文件更新完成！
 
     - name: Commit and push

bin/geodata/china_ip_list.txt

@@ -283,7 +283,6 @@
 43.229.155.0/24
 43.229.185.0/24
 43.229.216.0/22
-43.230.11.0/24
 43.230.136.0/24
 43.230.138.0/23
 43.230.182.0/24
@@ -376,8 +375,6 @@
 43.251.100.0/22
 43.251.244.0/22
 43.252.48.0/24
-43.252.208.0/24
-43.252.210.0/24
 43.254.0.0/22
 43.254.8.0/22
 43.254.24.0/22
@@ -402,7 +399,7 @@
 43.255.68.0/22
 43.255.84.0/22
 43.255.96.0/22
-43.255.116.0/23
+43.255.116.0/24
 43.255.156.0/24
 43.255.192.0/22
 43.255.200.0/23
@@ -424,7 +421,6 @@
 45.9.11.0/24
 45.12.82.0/24
 45.40.192.0/18
-45.59.128.0/23
 45.65.20.0/22
 45.82.236.0/22
 45.86.73.0/24
@@ -460,7 +456,6 @@
 45.120.243.0/24
 45.121.52.0/24
 45.121.55.0/24
-45.121.212.0/22
 45.123.128.0/22
 45.123.168.0/21
 45.123.176.0/21
@@ -692,6 +687,7 @@
 59.82.104.0/21
 59.82.112.0/20
 59.82.128.0/21
+59.82.136.0/23
 59.83.192.0/19
 59.83.224.0/21
 59.83.232.0/22
@@ -786,7 +782,6 @@
 101.33.4.0/23
 101.33.10.0/23
 101.33.17.0/24
-101.33.18.0/23
 101.33.26.0/23
 101.33.30.0/23
 101.33.32.0/19
@@ -1009,7 +1004,7 @@
 103.41.232.0/23
 103.42.8.0/22
 103.42.76.0/22
-103.43.172.0/23
+103.43.173.0/24
 103.43.175.0/24
 103.43.184.0/22
 103.44.56.0/22
@@ -1040,11 +1035,8 @@
 103.46.168.0/22
 103.47.48.0/22
 103.47.80.0/22
-103.48.171.0/24
 103.48.232.0/23
 103.49.12.0/22
-103.49.61.0/24
-103.49.62.0/24
 103.49.108.0/22
 103.49.180.0/22
 103.49.196.0/22
@@ -1080,8 +1072,6 @@
 103.61.153.0/24
 103.61.154.0/23
 103.61.188.0/22
-103.62.52.0/23
-103.62.55.0/24
 103.63.160.0/20
 103.63.176.0/21
 103.63.244.0/22
@@ -1115,6 +1105,7 @@
 103.73.116.0/22
 103.73.136.0/21
 103.73.144.0/22
+103.73.158.0/24
 103.73.204.0/22
 103.74.24.0/21
 103.74.32.0/20
@@ -1201,7 +1192,6 @@
 103.102.214.0/24
 103.103.12.0/24
 103.103.200.0/22
-103.104.199.0/24
 103.105.12.0/22
 103.105.60.0/22
 103.105.200.0/22
@@ -1344,12 +1334,12 @@
 103.169.50.0/23
 103.169.62.0/23
 103.170.4.0/23
-103.170.210.0/23
 103.170.212.0/23
 103.172.52.0/24
 103.172.80.0/24
 103.172.191.0/24
 103.174.94.0/23
+103.175.197.0/24
 103.177.28.0/23
 103.177.44.0/24
 103.178.56.0/24
@@ -1431,7 +1421,6 @@
 103.215.36.0/22
 103.215.44.0/23
 103.215.48.0/22
-103.215.124.0/24
 103.215.126.0/24
 103.215.140.0/22
 103.216.152.0/22
@@ -1439,7 +1428,7 @@
 103.218.216.0/22
 103.219.28.0/22
 103.219.32.0/21
-103.219.64.0/23
+103.219.65.0/24
 103.219.84.0/22
 103.219.92.0/24
 103.219.176.0/22
@@ -1498,11 +1487,9 @@
 103.233.136.0/23
 103.233.138.0/24
 103.234.20.0/22
-103.234.54.0/24
 103.234.56.0/22
 103.234.96.0/22
 103.234.128.0/22
-103.235.19.0/24
 103.235.44.0/22
 103.235.85.0/24
 103.235.136.0/22
@@ -1516,12 +1503,11 @@
 103.236.240.0/20
 103.237.8.0/22
 103.237.28.0/23
-103.237.101.0/24
-103.237.103.0/24
 103.237.176.0/20
 103.237.192.0/18
 103.238.0.0/21
 103.238.16.0/22
+103.238.48.0/24
 103.238.52.0/22
 103.238.96.0/23
 103.238.98.0/24
@@ -1607,6 +1593,7 @@
 104.192.110.0/24
 104.193.88.0/23
 104.193.90.0/24
+104.234.69.0/24
 106.0.4.0/22
 106.2.32.0/19
 106.2.64.0/18
@@ -2283,7 +2270,6 @@
 119.148.160.0/20
 119.161.120.0/22
 119.161.136.0/23
-119.161.138.0/24
 119.161.140.0/22
 119.161.144.0/22
 119.161.148.0/23
@@ -2773,9 +2759,7 @@
 147.78.132.0/22
 148.70.0.0/16
 149.115.124.0/24
-150.107.0.0/23
 150.109.0.0/16
-150.129.40.0/24
 150.129.136.0/22
 150.129.192.0/22
 150.129.252.0/22
@@ -2869,7 +2853,8 @@
 156.230.12.0/23
 156.230.24.0/24
 156.236.96.0/20
-156.236.112.0/22
+156.236.112.0/23
+156.236.115.0/24
 156.236.116.0/24
 156.236.120.0/24
 156.236.125.0/24
@@ -2889,7 +2874,6 @@
 157.10.34.0/24
 157.18.0.0/16
 157.61.0.0/16
-157.119.20.0/24
 157.119.28.0/22
 157.119.172.0/22
 157.122.0.0/16
@@ -2904,7 +2888,6 @@
 159.226.0.0/16
 160.19.208.0/21
 160.83.110.0/24
-160.181.160.0/19
 160.202.60.0/22
 160.202.168.0/22
 160.202.212.0/22
@@ -2933,13 +2916,11 @@
 163.0.0.0/16
 163.5.79.0/24
 163.47.4.0/22
-163.53.16.0/24
 163.53.44.0/22
 163.53.60.0/22
 163.53.88.0/21
 163.53.128.0/22
 163.53.168.0/22
-163.53.245.0/24
 163.125.0.0/16
 163.142.0.0/16
 163.177.0.0/16
@@ -2994,11 +2975,13 @@
 163.181.153.0/24
 163.181.154.0/24
 163.181.157.0/24
+163.181.158.0/23
 163.181.160.0/24
 163.181.162.0/23
 163.181.164.0/24
 163.181.166.0/23
 163.181.188.0/24
+163.181.191.0/24
 163.197.63.0/24
 163.204.0.0/16
 163.228.0.0/16
@@ -3168,7 +3151,7 @@
 185.75.174.0/24
 185.78.106.0/23
 185.216.248.0/22
-185.234.214.0/23
+185.234.214.0/24
 185.255.152.0/24
 188.131.128.0/17
 191.101.45.0/24
@@ -3178,7 +3161,6 @@
 192.102.204.0/22
 192.140.208.0/21
 192.144.128.0/17
-192.155.181.0/24
 192.163.11.0/24
 192.169.104.0/22
 192.232.97.0/24
@@ -4050,7 +4032,6 @@
 219.234.0.0/21
 219.234.64.0/18
 219.234.128.0/17
-219.235.8.0/21
 219.235.16.0/20
 219.235.32.0/19
 219.235.64.0/18

bin/geodata/china_ipv6_list.txt

@@ -109,7 +109,6 @@
 2400:da00::/32
 2400:dd00::/28
 2400:ebc0::/32
-2400:f6e0::/32
 2400:f720::/32
 2400:f7c0::/32
 2400:fb40::/32
@@ -305,6 +304,7 @@
 2404:2280:1e0::/48
 2404:2280:1e2::/47
 2404:2280:1e4::/47
+2404:2280:1e6::/48
 2404:6380::/48
 2404:6380:1000::/48
 2404:6380:8001::/48
@@ -445,6 +445,7 @@
 2406:840:e230::/48
 2406:840:e280::/48
 2406:840:e300::/47
+2406:840:e302::/48
 2406:840:e340::/44
 2406:840:e36f::/48
 2406:840:e500::/47
@@ -489,8 +490,6 @@
 2406:840:fa01::/48
 2406:840:fd00::/47
 2406:840:fd03::/48
-2406:840:fd05::/48
-2406:840:fd06::/48
 2406:840:fd1f::/48
 2406:840:fe27::/48
 2406:840:fe50::/48
@@ -1050,7 +1049,9 @@
 2409:2000::/32
 2409:27fa::/48
 2409:27fa:f000::/48
+2409:27fb::/48
 2409:27fc::/48
+2409:27fe::/33
 2409:6100::/44
 2409:8000::/20
 240a:2000::/29
@@ -1138,13 +1139,13 @@
 2602:2a4:ff::/48
 2602:2c3:810::/44
 2602:f9a9:101::/48
-2602:f9ba:a9::/48
+2602:f9df:400::/47
-2602:f9df:400::/48
 2602:f9df:410::/48
-2602:f9df:420::/48
 2602:f9df:500::/48
 2602:f9df:505::/48
 2602:f9df:510::/47
+2602:f9df:515::/48
+2602:f9df:516::/48
 2602:f9f6:400::/44
 2602:fab0:11::/48
 2602:fbda:600::/48
@@ -1230,7 +1231,8 @@
 2a05:1087::/32
 2a05:dfc1:1600::/47
 2a05:dfc1:1602::/48
-2a05:dfc1:1608::/48
+2a05:dfc1:1606::/48
+2a05:dfc1:1608::/47
 2a05:dfc1:5900::/41
 2a05:dfc1:5a00::/40
 2a05:dfc1:6607::/48
@@ -1275,7 +1277,8 @@
 2a06:a005:13b0::/44
 2a06:a005:13c0::/43
 2a06:a005:13e0::/47
-2a06:a005:13eb::/48
+2a06:a005:13ea::/47
+2a06:a005:13ed::/48
 2a06:a005:1520::/44
 2a06:a005:1700::/44
 2a06:a005:1800::/48
@@ -1296,34 +1299,20 @@
 2a06:a005:2940::/43
 2a06:a005:2980::/44
 2a06:a005:29d1::/48
-2a06:de00:de04::/48
 2a06:de00:de0e::/47
-2a06:de01:801::/48
+2a06:de01:807::/48
-2a06:de01:805::/48
+2a06:de01:87e::/48
-2a06:de01:819::/48
+2a06:de01:8b9::/48
-2a06:de01:82a::/48
+2a06:de01:8bb::/48
-2a06:de01:842::/47
+2a06:de01:8c4::/48
-2a06:de01:892::/48
+2a06:de01:936::/48
-2a06:de01:898::/48
+2a06:de01:93e::/48
-2a06:de01:8a2::/48
+2a06:de01:95b::/48
-2a06:de01:8d1::/48
+2a06:de01:982::/48
-2a06:de01:8dd::/48
+2a06:de01:ad8::/48
-2a06:de01:8ed::/48
+2a06:de01:ae1::/48
-2a06:de01:902::/48
+2a06:de01:b1c::/48
-2a06:de01:91c::/48
+2a06:de01:b1e::/48
-2a06:de01:937::/48
-2a06:de01:941::/48
-2a06:de01:960::/48
-2a06:de01:972::/48
-2a06:de01:97a::/48
-2a06:de01:997::/48
-2a06:de01:9a6::/48
-2a06:de01:ad4::/48
-2a06:de01:ad6::/48
-2a06:de01:af4::/48
-2a06:de01:afc::/48
-2a06:de01:b00::/48
-2a06:de01:b03::/48
 2a06:e881:2509::/48
 2a06:e881:5501::/48
 2a06:e881:5502::/48
@@ -1391,10 +1380,7 @@
 2a0b:b87:ffb5::/48
 2a0b:2542::/48
 2a0b:2542:300::/40
-2a0b:4340:6::/48
-2a0b:4340:22::/48
 2a0b:4340:30::/44
-2a0b:4340:60::/44
 2a0b:4340:70::/48
 2a0b:4340:90::/48
 2a0b:4340:93::/48
@@ -1423,7 +1409,6 @@
 2a0c:b641:a60::/44
 2a0c:b641:b21::/48
 2a0c:b641:b25::/48
-2a0c:b641:b26::/48
 2a0c:b642:4101::/48
 2a0c:b642:4102::/47
 2a0c:b642:4104::/47
@@ -1435,7 +1420,6 @@
 2a0d:2581:fffe::/47
 2a0d:2683:2::/48
 2a0d:2687::/32
-2a0d:2904::/44
 2a0d:2906:f000::/44
 2a0d:c7c7::/32
 2a0e:800:ff00::/48
@@ -1465,6 +1449,7 @@
 2a0e:aa07:e035::/48
 2a0e:aa07:e039::/48
 2a0e:aa07:e043::/48
+2a0e:aa07:e044::/48
 2a0e:aa07:e050::/44
 2a0e:aa07:e060::/48
 2a0e:aa07:e071::/48
@@ -1504,6 +1489,7 @@
 2a0e:b107:16c0::/44
 2a0e:b107:1a40::/46
 2a0e:b107:1b60::/48
+2a0e:b107:1b6f::/48
 2a0e:b107:1d25::/48
 2a0e:b107:1e85::/48
 2a0f:1440::/29
@@ -1514,11 +1500,11 @@
 2a0f:7803:fc30::/44
 2a0f:7803:fcc0::/44
 2a0f:7803:fd00::/40
-2a0f:7803:fe21::/48
 2a0f:7803:fe23::/48
 2a0f:7803:fe80::/47
 2a0f:7803:fe82::/48
 2a0f:7803:ff10::/48
+2a0f:7803:ffd1::/48
 2a0f:7980::/44
 2a0f:85c1:100::/47
 2a0f:9400:6110::/48
@@ -1551,7 +1537,6 @@
 2a12:dd47:5c00::/40
 2a12:f8c0::/48
 2a12:f8c0:1000::/40
-2a12:f8c0:2000::/40
 2a12:f8c1::/48
 2a12:f8c3::/36
 2a13:1800::/48
@@ -1562,12 +1547,11 @@
 2a13:1802::/44
 2a13:a5c3:f000::/40
 2a13:a5c4:1000::/38
-2a13:a5c7:1200::/40
 2a13:a5c7:1500::/40
 2a13:a5c7:1600::/45
 2a13:a5c7:1608::/47
-2a13:a5c7:1610::/47
+2a13:a5c7:1610::/46
-2a13:a5c7:1612::/48
+2a13:a5c7:1801::/48
 2a13:a5c7:1803::/48
 2a13:aac4:f000::/44
 2a13:b487:11da::/48
@@ -1584,6 +1568,7 @@
 2a13:df80:3b10::/48
 2a13:df80:6808::/48
 2a13:df85:be00::/48
+2a13:df85:be0e::/48
 2a13:df85:be10::/48
 2a13:df85:be80::/48
 2a13:df85:be88::/48

bin/version

@@ -5,3 +5,4 @@ meta_v=v1.18.0
 singboxp_v=1.8.5-73d97226
 singbox_v=1.8.5
 versionsh=1.9.0pre13
+GeoIP_v=20240302

scripts/getdate.sh

@@ -336,11 +336,20 @@ setproxies(){ #自定义clash节点
 }
 gen_clash_providers(){ #生成clash的providers配置文件
 	gen_clash_providers_txt(){ 
+		if [ -n "$(echo $2|grep -E '^./')" ];then
+			local type=file
+			local path=$2
+			local download_url=
+		else
+			local type=http
+			local path="./providers/${1}.yaml"
+			local download_url=$2
+		fi
 		cat >> $TMPDIR/providers/providers.yaml <<EOF
   ${1}:
     type: http
-    url: "${2}"
+    url: "$download_url"
-    path: ./providers/${1}.yaml
+    path: "$path"
     interval: 43200
     health-check:
       enable: true
@@ -349,7 +358,7 @@ gen_clash_providers(){ #生成clash的providers配置文件
       interval: 600
 EOF
 		[ "$crashcore" = 'meta' ] && {
-		[ "$skip_cert" = "已开启" ] && skip_cert_verify='skip-cert-verify: true'
+		[ "$skip_cert" != "未开启" ] && skip_cert_verify='skip-cert-verify: true'
 		cat >> $TMPDIR/providers/providers.yaml <<EOF
     override:
       udp: true
@@ -417,7 +426,18 @@ EOF
 }
 gen_singbox_providers(){ #生成singbox的providers配置文件
 	gen_singbox_providers_txt(){ 
-		cat >> ${TMPDIR}/providers/providers.json <<EOF
+		if [ -n "$(echo $2|grep -E '^./')" ];then
+			cat >> ${TMPDIR}/providers/providers.json <<EOF
+	{
+      "tag": "${1}",
+      "type": "file",
+      "healthcheck_url": "https://www.gstatic.com/generate_204",
+      "healthcheck_interval": "10m",
+	  "path": "${2}"
+	},
+EOF
+		else
+			cat >> ${TMPDIR}/providers/providers.json <<EOF
 	{
       "tag": "${1}",
       "type": "http",
@@ -430,6 +450,8 @@ gen_singbox_providers(){ #生成singbox的providers配置文件
       "download_detour": "DIRECT"
 	},
 EOF
+		fi
+
 	}
 	if [ -z "$(grep "provider_temp_${coretype}" ${CRASHDIR}/configs/ShellCrash.cfg)" ];then
 		provider_temp_file=$(sed -n "1 p" ${CRASHDIR}/configs/${coretype}_providers.list | awk '{print $2}')
@@ -495,7 +517,8 @@ EOF
 setproviders(){ #自定义providers
 	echo -----------------------------------------------
 	echo -e "\033[33m你可以在这里快捷管理与生成自定义的providers提供者\033[0m"
-	echo -e "\033[33m暂时只支持yaml格式的配置导入，并且不支持跳过证书验证功能\033[0m"
+	echo -e "\033[36m支持在线及本地的Yaml格式配置导入\033[0m"
+	echo -e "\033[33msingboxp内核暂不支持跳过证书验证功能\033[0m"
 	[ -s $CRASHDIR/configs/providers.cfg ] && { 
 		echo -----------------------------------------------
 		echo -e "\033[36m输入对应数字可管理providers提供者\033[0m"
@@ -538,8 +561,8 @@ setproviders(){ #自定义providers
 				fi
 			;;	
 			2)
-				read -p "请输入http(s)格式的providers链接地址 > " link
+				read -p "请输入providers订阅地址或本地相对路径 > " link
-				if [ -n "$(echo $link | grep -E '.*\..*')" ] && [ -z "$(grep "$link" $CRASHDIR/configs/providers.cfg)" ];then
+				if [ -n "$(echo $link | grep -E '.*\..*|^\./')" ] && [ -z "$(grep "$link" $CRASHDIR/configs/providers.cfg)" ];then
 					link=$(echo $link | sed 's/\&/\\\&/g') #特殊字符添加转义
 					sed -i "s|$provider_name $provider_url|$provider_name $link|" $CRASHDIR/configs/providers.cfg
 				else
@@ -562,13 +585,16 @@ setproviders(){ #自定义providers
 	;;
 	a)
 		echo -----------------------------------------------
-		read -p "请输入http(s)格式的providers订阅地址 > " link
+		echo -e "支持填写在线的\033[32mYClash订阅地址\033[0m或者\033[32m本地Clash配置文件\033[0m"
-		[ -n "$(echo $link | grep -E '.*\..*')" ] && {
+		echo -e "本地配置文件请放在\033[32m$CRASHDIR\033[0m目录下，并填写相对路径如【\033[32m./providers/test.yaml\033[0m】"
+		echo -----------------------------------------------
+		read -p "请输入providers订阅地址或本地相对路径 > " link
+		[ -n "$(echo $link | grep -E '.*\..*|^\./')" ] && {
 			read -p "请输入代理提供者的名称或者代号(不可重复) > " name
 			[ -n "$name" ] && [ -z "$(grep "name" $CRASHDIR/configs/providers.cfg)" ] && { 
 				echo -----------------------------------------------
 				echo -e "代理提供者：\033[36m$name\033[0m"
-				echo -e "链接地址：\033[32m$link\033[0m"
+				echo -e "链接地址/路径：\033[32m$link\033[0m"
 				read -p "确认添加？(1/0) > " res
 					[ "$res" = 1 ] && {
 						echo "$name $link" >> $CRASHDIR/configs/providers.cfg
@@ -1696,6 +1722,9 @@ setgeo(){ #数据库选择菜单
 			for file in cn_ip.txt cn_ipv6.txt Country.mmdb GeoSite.dat geoip.db geosite.db ;do
 				rm -rf $CRASHDIR/$file
 			done
+			for var in Country_v cn_mini_v china_ip_list_v china_ipv6_list_v geosite_v geoip_cn_v geosite_cn_v ;do
+				setconfig $var
+			done
 			rm -rf $CRASHDIR/*.srs
 			echo -e "\033[33m所有数据库文件均已清理！\033[0m"
 			sleep 1
@@ -2025,6 +2054,7 @@ checkupdate(){
 	[ "$?" = "0" ] && version_new=$(cat ${TMPDIR}/version_new | grep -oE 'versionsh=.*' | awk -F'=' '{ print $2 }')
 	if [ -n "$version_new" ];then
 		source ${TMPDIR}/version_new 2>/dev/null
+		cat ${TMPDIR}/version_new
 	else
 		echo -e "\033[31m检查更新失败！请尝试切换其他安装源！\033[0m"
 		setserver
@@ -2048,7 +2078,7 @@ update(){
 	echo -----------------------------------------------
 	echo -e " 1 更新\033[36m管理脚本    \033[33m$versionsh_l\033[0m > \033[32m$version_new \033[36m$release_type\033[0m"
 	echo -e " 2 切换\033[33m内核文件    \033[33m$core_v\033[0m > \033[32m$core_v_new\033[0m"
-	echo -e " 3 更新\033[32m数据库文件\033[0m"
+	echo -e " 3 更新\033[32m数据库文件\033[0m	> \033[32m$GeoIP_v\033[0m"
 	echo -e " 4 安装本地\033[35mDashboard\033[0m面板"
 	echo -e " 5 安装/更新本地\033[33m根证书文件\033[0m"
 	echo -e " 6 查看\033[32mPAC\033[0m自动代理配置"

scripts/init.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright (C) Juewuy
 
-version=test
+version=1.9.0pre14
 
 setdir(){
 	dir_avail(){

scripts/menu.sh

@@ -108,7 +108,7 @@ ckstatus(){
 	#检查执行权限
 	[ ! -x ${CRASHDIR}/start.sh ] && chmod +x ${CRASHDIR}/start.sh
 	#检查/tmp内核文件
-	for file in `ls -F /tmp | grep -v [/\$] | grep -v ' ' | grep -Ev  ".*[(gz)(zip)(7z)(tar)]$" | grep -iE '^clash$|^clash-linux.*|^mihomo.*|^sing.*box|^clash.meta.*'` ; do 
+	for file in `ls -F /tmp | grep -v [/\$] | grep -v ' ' | grep -Ev  ".*[(gz)(zip)(7z)(tar)]$" | grep -iE 'CrashCore|^clash$|^clash-linux.*|^mihomo.*|^sing.*box|^clash.meta.*'` ; do 
 		file=/tmp/$file
 		chmod +x $file
 		echo -e "发现可用的内核文件： \033[36m$file\033[0m "

scripts/task.sh

@@ -127,22 +127,21 @@ update_mmdb(){ #自动更新数据库
 			if [ "$?" != "0" ];then
 				logger "任务【自动更新数据库文件】更新【$2】下载失败！"
 				rm -rf ${TMPDIR}/$1
-				return 1
 			else
 				mv -f ${TMPDIR}/$1 ${BINDIR}/$1
 				setconfig $geo_v $GeoIP_v
 				logger "任务【自动更新数据库文件】更新【$2】成功！"
-				return 0
 			fi
 		fi
 	}
-	[ -n "${Country_v}" ] && getgeo Country.mmdb Country.mmdb
+	[ -n "${Country_v}" -a -s $CRASHDIR/Country.mmdb ] && getgeo Country.mmdb Country.mmdb
-	[ -n "${cn_mini_v}" ] && getgeo Country.mmdb cn_mini.mmdb
+	[ -n "${cn_mini_v}" -a -s $CRASHDIR/Country.mmdb ] && getgeo Country.mmdb cn_mini.mmdb
-	[ -n "${china_ip_list_v}" ] && getgeo cn_ip.txt china_ip_list.txt
+	[ -n "${china_ip_list_v}" -a -s $CRASHDIR/cn_ip.txt ] && getgeo cn_ip.txt china_ip_list.txt
-	[ -n "${china_ipv6_list_v}" ] && getgeo cn_ipv6.txt china_ipv6_list.txt
+	[ -n "${china_ipv6_list_v}" -a -s $CRASHDIR/cn_ipv6.txt ] && getgeo cn_ipv6.txt china_ipv6_list.txt
-	[ -n "${geosite_v}" ] && getgeo GeoSite.dat geosite.dat
+	[ -n "${geosite_v}" -a -s $CRASHDIR/GeoSite.dat ] && getgeo GeoSite.dat geosite.dat
-	[ -n "${geoip_cn_v}" ] && getgeo geoip.db geoip_cn.db
+	[ -n "${geoip_cn_v}" -a -s $CRASHDIR/geoip.db ] && getgeo geoip.db geoip_cn.db
-	[ -n "${geosite_cn_v}" ] && getgeo geosite.db geosite_cn.db
+	[ -n "${geosite_cn_v}" -a -s $CRASHDIR/geosite.db ] && getgeo geosite.db geosite_cn.db
+	return 0
 }
 reset_firewall(){ #重设透明路由防火墙
 	${CRASHDIR}/start.sh stop_firewall