Merge branch 'master' of https://github.com/juewuy/ShellClash into master

2022-11-08 22:07:13 +08:00
parent d48402a101 e434b00703
commit 66d230f748
9 changed files with 21126 additions and 20930 deletions
--- a/bin/Country.mmdb
+++ b/bin/Country.mmdb
--- a/bin/clashdb.tar.gz
+++ b/bin/clashdb.tar.gz
--- a/bin/cn_mini.mmdb
+++ b/bin/cn_mini.mmdb
--- a/bin/geosite.dat
+++ b/bin/geosite.dat
--- a/bin/meta_db.tar.gz
+++ b/bin/meta_db.tar.gz
--- a/bin/meta_yacd.tar.gz
+++ b/bin/meta_yacd.tar.gz
--- a/bin/version
+++ b/bin/version
@@ -3,4 +3,4 @@ clashpre_v=2021.09.15
 clash_v=v1.7.1
 meta_v=v1.12.0
 versionsh=1.6.5
-GeoIP_v=20221029
+GeoIP_v=20221108
--- a/bin/yacd.tar.gz
+++ b/bin/yacd.tar.gz
--- a/scripts/clash.sh
+++ b/scripts/clash.sh
@@ -141,7 +141,7 @@ setport(){
 		elif [ $portx -gt 65535 -o $portx -le 1 ]; then
 			echo -e "\033[31m输入错误！请输入正确的数值(1-65535)！\033[0m"
 			inputport
-		elif [ -n "$(echo $mix_port$redir_port$dns_port$db_port|grep $portx)" ]; then
+		elif [ -n "$(echo "|$mix_port|$redir_port|$dns_port|$db_port|" | grep "|$portx|")" ]; then
 			echo -e "\033[31m输入错误！请不要输入重复的端口！\033[0m"
 			inputport
 		elif [ -n "$(netstat -ntul |grep :$portx)" ];then