diff --git a/bin/clash/clash-linux-mipsle-hardfloat b/bin/clash/clash-linux-mipsle-hardfloat new file mode 100644 index 0000000..60e30a2 Binary files /dev/null and b/bin/clash/clash-linux-mipsle-hardfloat differ diff --git a/bin/clashpre/clash-linux-386 b/bin/clashpre/clash-linux-386 index 157861b..ee51643 100644 Binary files a/bin/clashpre/clash-linux-386 and b/bin/clashpre/clash-linux-386 differ diff --git a/bin/clashpre/clash-linux-amd64 b/bin/clashpre/clash-linux-amd64 index c838a4a..5e5837f 100644 Binary files a/bin/clashpre/clash-linux-amd64 and b/bin/clashpre/clash-linux-amd64 differ diff --git a/bin/clashpre/clash-linux-armv5 b/bin/clashpre/clash-linux-armv5 index bc8d3e3..3f66610 100644 Binary files a/bin/clashpre/clash-linux-armv5 and b/bin/clashpre/clash-linux-armv5 differ diff --git a/bin/clashpre/clash-linux-armv7 b/bin/clashpre/clash-linux-armv7 index 069b197..330d3a6 100644 Binary files a/bin/clashpre/clash-linux-armv7 and b/bin/clashpre/clash-linux-armv7 differ diff --git a/bin/clashpre/clash-linux-armv8 b/bin/clashpre/clash-linux-armv8 index b518e98..030867f 100644 Binary files a/bin/clashpre/clash-linux-armv8 and b/bin/clashpre/clash-linux-armv8 differ diff --git a/bin/clashpre/clash-linux-mipsle-hardfloat b/bin/clashpre/clash-linux-mipsle-hardfloat new file mode 100644 index 0000000..67bbad0 Binary files /dev/null and b/bin/clashpre/clash-linux-mipsle-hardfloat differ diff --git a/bin/clashpre/clash-linux-mipsle-softfloat b/bin/clashpre/clash-linux-mipsle-softfloat index 43c8554..d592683 100644 Binary files a/bin/clashpre/clash-linux-mipsle-softfloat and b/bin/clashpre/clash-linux-mipsle-softfloat differ diff --git a/bin/clashpre/version b/bin/clashpre/version index d3c63ea..a28162f 100644 --- a/bin/clashpre/version +++ b/bin/clashpre/version @@ -1 +1 @@ -version=2020.08.16 +version=2020.09.27 diff --git a/scripts/getdate.sh b/scripts/getdate.sh index c542a64..c4d8db6 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -85,6 +85,7 @@ linkset } linkset(){ if [ -n $Url ];then + [ -z "$skip_cert" ] && skip_cert=已开启 echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[47;30m请检查输入的链接是否正确:\033[0m" echo -e "\033[32;4m$Url\033[0m" @@ -93,7 +94,7 @@ if [ -n $Url ];then echo -e " 2 \033[36m添加/修改节点过滤关键字 \033[47;30m$exclude\033[0m" echo -e " 3 \033[33m选取配置规则模版\033[0m" echo -e " 4 \033[0m选取在线生成服务器\033[0m" - echo -e " 5 \033[0m跳过本地证书验证: \033[36m$skip_cert\033[0m ————解决节点证书验证错误" + echo -e " 5 \033[0m跳过本地证书验证: \033[36m$skip_cert\033[0m ————自建tls节点务必开启" echo ----------------------------------------------- echo -e " 0 \033[31m取消导入\033[0m并返回上级菜单" echo ----------------------------------------------- @@ -150,7 +151,8 @@ do echo -e "\033[44m 遇问题请加TG群反馈:\033[42;30m t.me/clashfm \033[0m" echo ----------------------------------------------- echo -e "支持批量导入\033[30;46m Http/Https/Clash \033[0m等格式的订阅链接" - echo -e "以及\033[30;42m Vmess/SSR/SS/Trojan/Sock5 \033[0m等格式的节点链接" + echo -e "以及\033[30;42m Vmess/SSR/SS/Trojan \033[0m等格式的节点链接" + echo -e "自建Trojan节点链接格式为:trojan://密码@host地址:443" echo ----------------------------------------------- echo -e "多个较短的链接可以用\033[30;47m | \033[0m号分隔以一次性输入" echo -e "多个较长的链接可分次输入,支持多达\033[30;47m 99 \033[0m次输入" @@ -303,9 +305,12 @@ cpucore=$(uname -ms | tr ' ' '_' | tr '[A-Z]' '[a-z]') [ -n "$(echo $cpucore | grep -E "linux.*aarch64.*")" ] && cpucore="armv8" [ -n "$(echo $cpucore | grep -E "linux.*armv8.*")" ] && cpucore="armv8" [ -n "$(echo $cpucore | grep -E "linux.*armv7.*")" ] && cpucore="armv7" -[ -n "$(echo $cpucore | grep -E "linux.*mips.*")" ] && cpucore="mipsle-softfloat" [ -n "$(echo $cpucore | grep -E "linux.*x86.*")" ] && cpucore="386" [ -n "$(echo $cpucore | grep -E "linux.*x86_64.*")" ] && cpucore="amd64" +if [ -n "$(echo $cpucore | grep -E "linux.*mips.*")" ];then + cpucore="mipsle-softfloat" + [ -n "$(uname -a | grep -E "*M2100*")" ] && cpucore="mipsle-hardfloat" +fi ### echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "当前clash核心:\033[47;30m $clashcore \033[46;30m$clashv\033[0m" diff --git a/scripts/start.sh b/scripts/start.sh index 8a2897b..12c657d 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -5,16 +5,18 @@ getconfig(){ #加载环境变量 [ -z "$clashdir" ] && source /etc/profile > /dev/null 2>&1 ccfg=$clashdir/mark -if [ ! -f "$ccfg" ]; then - echo mark文件不存在,默认以Redir模式运行! -cat >$ccfg<> $ccfg +source $ccfg +#默认设置 +[ -z "$skip_cert" ] && skip_cert=已开启 +[ -z "$common_ports" ] && common_ports=已开启 +[ -z "$dns_mod" ] && dns_mod=redir_host +[ -z "$dns_over" ] && dns_over=已开启 +[ -z "$modify_yaml" ] && modify_yaml=未开启 +[ -z "$ipv6_support" ] && ipv6_support=未开启 +[ -z "$start_old" ] && start_old=未开启 +[ -z "$local_proxy" ] && local_proxy=未开启 #是否代理常用端口 [ "$common_ports" = "已开启" ] && ports='-m multiport --dports 22,53,587,465,995,993,143,80,443 ' #检测系统端口占用