diff --git a/bin/ShellClash.tar.gz b/bin/ShellClash.tar.gz index 8f2a79363..dd847fb39 100644 Binary files a/bin/ShellClash.tar.gz and b/bin/ShellClash.tar.gz differ diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index caf8873d8..859566fe9 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/bin/public.tar.gz b/bin/public.tar.gz index 5ed30867d..2c7d79598 100644 Binary files a/bin/public.tar.gz and b/bin/public.tar.gz differ diff --git a/bin/release_version b/bin/release_version index 647f5de6a..68e0aada1 100644 --- a/bin/release_version +++ b/bin/release_version @@ -1,8 +1,7 @@ +1.8.0 1.7.0 1.6.3 1.5.1 1.3.0 1.2.0 1.1.0 -1.0.0beta11 -0.9.7 diff --git a/bin/version b/bin/version index f6640632a..9fe6c1690 100644 --- a/bin/version +++ b/bin/version @@ -2,5 +2,5 @@ clashnet_v=v1.7.6 clashpre_v=2022.11.25 clash_v=v1.7.1 meta_v=v1.15.0 -versionsh=1.7.10h GeoIP_v=20230819 +versionsh=1.8.0 diff --git a/scripts/clash.sh b/scripts/clash.sh index 444bac1df..039879328 100644 --- a/scripts/clash.sh +++ b/scripts/clash.sh @@ -1184,9 +1184,9 @@ clashcfg(){ echo -e "\033[33m切换模式后需要手动重启clash服务以生效!\033[0m" echo ----------------------------------------------- echo -e " 1 fake-ip模式: \033[32m响应速度更快\033[0m" - echo -e " 兼容性比较差,部分应用可能打不开" + echo -e " 不支持绕过CN-IP功能" echo -e " 2 redir_host模式:\033[32m兼容性更好\033[0m" - echo -e " 不支持Tun模式,抗污染能力略差" + echo -e " 需搭配加密DNS使用" echo " 0 返回上级菜单" read -p "请输入对应数字 > " num if [ -z "$num" ]; then diff --git a/scripts/init.sh b/scripts/init.sh index 40d43b94c..ebebe94e4 100644 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) Juewuy -version=1.7.10h +version=1.8.0 setdir(){ dir_avail(){ diff --git a/scripts/start.sh b/scripts/start.sh index a8f03ed0c..acc9c6e51 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -467,6 +467,8 @@ EOF if [ "$?" != 0 ];then logger "$($bindir/clash -t -d $bindir -f $TMPDIR/config.yaml | grep -Eo 'error.*=.*')" 31 logger "自定义配置文件校验失败!将使用基础配置文件启动!" 33 + logger "错误详情请参考 $TMPDIR/error.yaml 文件!" 33 + mv -f $TMPDIR/config.yaml $TMPDIR/error.yaml &>/dev/null sed -i "/#自定义策略组开始/,/#自定义策略组结束/d" $TMPDIR/proxy-groups.yaml mv -f $TMPDIR/set_bak.yaml $TMPDIR/set.yaml &>/dev/null #合并基础配置文件