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

This commit is contained in:
juewuy 2022-11-08 22:07:13 +08:00
commit 66d230f748
9 changed files with 21126 additions and 20930 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 114 KiB

After

Width:  |  Height:  |  Size: 114 KiB

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

View File

@ -3,4 +3,4 @@ clashpre_v=2021.09.15
clash_v=v1.7.1 clash_v=v1.7.1
meta_v=v1.12.0 meta_v=v1.12.0
versionsh=1.6.5 versionsh=1.6.5
GeoIP_v=20221029 GeoIP_v=20221108

Binary file not shown.

View File

@ -141,7 +141,7 @@ setport(){
elif [ $portx -gt 65535 -o $portx -le 1 ]; then elif [ $portx -gt 65535 -o $portx -le 1 ]; then
echo -e "\033[31m输入错误请输入正确的数值(1-65535)\033[0m" echo -e "\033[31m输入错误请输入正确的数值(1-65535)\033[0m"
inputport 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" echo -e "\033[31m输入错误请不要输入重复的端口\033[0m"
inputport inputport
elif [ -n "$(netstat -ntul |grep :$portx)" ];then elif [ -n "$(netstat -ntul |grep :$portx)" ];then