diff --git a/bin/Country.mmdb b/bin/Country.mmdb index 61054dd4..a0ebf0ea 100644 Binary files a/bin/Country.mmdb and b/bin/Country.mmdb differ diff --git a/bin/clash.net/clash-linux-386 b/bin/clash.net/clash-linux-386 index 76747fd3..43655c7b 100644 Binary files a/bin/clash.net/clash-linux-386 and b/bin/clash.net/clash-linux-386 differ diff --git a/bin/clash.net/clash-linux-amd64 b/bin/clash.net/clash-linux-amd64 index 35b26499..39219013 100644 Binary files a/bin/clash.net/clash-linux-amd64 and b/bin/clash.net/clash-linux-amd64 differ diff --git a/bin/clash.net/clash-linux-armv5 b/bin/clash.net/clash-linux-armv5 index 110162a3..ee1a1da8 100644 Binary files a/bin/clash.net/clash-linux-armv5 and b/bin/clash.net/clash-linux-armv5 differ diff --git a/bin/clash.net/clash-linux-armv7 b/bin/clash.net/clash-linux-armv7 index 221cd32a..09f67cfe 100644 Binary files a/bin/clash.net/clash-linux-armv7 and b/bin/clash.net/clash-linux-armv7 differ diff --git a/bin/clash.net/clash-linux-armv8 b/bin/clash.net/clash-linux-armv8 index fa9948f4..8de50ce0 100644 Binary files a/bin/clash.net/clash-linux-armv8 and b/bin/clash.net/clash-linux-armv8 differ diff --git a/bin/clash.net/clash-linux-mips-softfloat b/bin/clash.net/clash-linux-mips-softfloat index 9c872130..a11ce2f8 100644 Binary files a/bin/clash.net/clash-linux-mips-softfloat and b/bin/clash.net/clash-linux-mips-softfloat differ diff --git a/bin/clash.net/clash-linux-mipsle-hardfloat b/bin/clash.net/clash-linux-mipsle-hardfloat index 62427012..4d4653bf 100644 Binary files a/bin/clash.net/clash-linux-mipsle-hardfloat and b/bin/clash.net/clash-linux-mipsle-hardfloat differ diff --git a/bin/clash.net/clash-linux-mipsle-softfloat b/bin/clash.net/clash-linux-mipsle-softfloat index 39b7ff7b..8178ab5e 100644 Binary files a/bin/clash.net/clash-linux-mipsle-softfloat and b/bin/clash.net/clash-linux-mipsle-softfloat differ diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index 9cc5e9e9..c82ae658 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/bin/cn_mini.mmdb b/bin/cn_mini.mmdb index ee421da8..e24b609c 100644 Binary files a/bin/cn_mini.mmdb and b/bin/cn_mini.mmdb differ diff --git a/bin/version b/bin/version index 89026270..21a5a389 100644 --- a/bin/version +++ b/bin/version @@ -1,5 +1,5 @@ -clashnet_v=1.7.3 +clashnet_v=1.7.6 clash_v=1.7.1 clashpre_v=2021.09.15 -GeoIP_v=202112030302 -versionsh=1.4.7 +GeoIP_v=202112310302 +versionsh=1.4.8 diff --git a/scripts/clash.sh b/scripts/clash.sh index c452dab8..b6aa7467 100644 --- a/scripts/clash.sh +++ b/scripts/clash.sh @@ -1043,6 +1043,8 @@ tools(){ echo ----------------------------------------------- echo -e "\033[30;47m欢迎使用其他工具菜单:\033[0m" echo -e "\033[33m本页工具可能无法兼容全部Linux设备,请酌情使用!\033[0m" + echo -e "磁盘占用/所在目录:" + du -sh $clashdir echo ----------------------------------------------- echo -e " 1 ShellClash测试菜单" [ -f "/etc/firewall.user" ] && echo -e " 2 \033[32m配置\033[0m外网访问SSH" diff --git a/scripts/getdate.sh b/scripts/getdate.sh index c74050c6..1c5efbde 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -187,7 +187,10 @@ getlink(){ getlink2(){ echo ----------------------------------------------- echo -e "\033[33m仅限导入完整clash配置文件链接!!!\033[0m" - echo -e "可使用\033[4;32mhttps://acl4ssr.netlify.app\033[0m在线生成配置文件" + echo ----------------------------------------------- + echo -e "\033[31m有流媒体需求,请使用\033[32m6-1在线生成配置文件功能!!!\033[0m" + echo -e "\033[31m如不了解机制,请使用\033[32m6-1在线生成配置文件功能!!!\033[0m" + echo -e "\033[31m如遇任何问题,请使用\033[32m6-1在线生成配置文件功能!!!\033[0m" echo ----------------------------------------------- echo -e "\033[33m0 返回上级菜单\033[0m" echo ----------------------------------------------- @@ -978,8 +981,6 @@ testcommand(){ echo ----------------------------------------------- echo -e "\033[30;47m这里是测试命令菜单\033[0m" echo -e "\033[33m如遇问题尽量运行相应命令后截图发群\033[0m" - echo -e "磁盘占用/所在目录:" - du -sh $clashdir echo ----------------------------------------------- echo " 1 查看clash运行时的报错信息" echo " 2 查看系统DNS端口(:53)占用 " diff --git a/scripts/start.sh b/scripts/start.sh index dc793c47..1266172a 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -93,11 +93,11 @@ getyaml(){ [ -z "$server_link" ] && server_link=1 #前后端订阅服务器地址索引,可在此处添加! Server=`sed -n ""$server_link"p"<