xm/ShellCrash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.5.0-预览版

Browse Source 
~同步最新1.9.0官方内核及premium内核
~meta核切换至dev分支版本并移除了geosite的自动下载功能
~同步最新Geoip及CNIP数据库文件
~同步最新Dashboard面板文件
~DNS解析默认不再提供IPV6结果，需手动开启
~现在将从配置文件中获取运行模式而不是固定的Rule模式
~在线生成配置文件功能添加对vless协议的支持
~增加了对vless协议的检测机制，优化使用体验
~修复使用环境变量设置本机代理不生效的bug
~修复meta内核版本号显示不正常的bug
~修复部分情况下下载出错后不会正常重试的bug
This commit is contained in:
juewuy
2022-01-31 14:39:32 +08:00
parent 4030037f3a
commit a12cdaf5b2
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/getdate.sh
View File

@@ -463,11 +463,11 @@ setcore(){
echo "2 clashpre： 支持Tun模式、混合模式" echo "2 clashpre： 支持Tun模式、混合模式"
echo "(高级预览版) 内存占用更高" echo "(高级预览版) 内存占用更高"
echo echo
echo "3 clash.net： 支持vless/xtls" echo "3 clash.net： 支持部分vless协议"
echo "(.net定制版) 第三方定制内核" echo "(.net定制版) 第三方定制内核"
echo echo
echo "4 clash.meta：支持vless/xtls" echo "4 clash.meta：支持大部分vless协议"
echo "(meta定制版) 需要额外4M空间占用" echo "(meta定制版) 第三方定制内核"
echo echo
echo "5 手动指定处理器架构" echo "5 手动指定处理器架构"
echo ----------------------------------------------- echo -----------------------------------------------

14
scripts/start.sh
View File

@@ -135,7 +135,7 @@ EOF`
yaml=$clashdir/config.yaml yaml=$clashdir/config.yaml
yamlnew=/tmp/clash_config_$USER.yaml yamlnew=/tmp/clash_config_$USER.yaml
rm -rf $yamlnew rm -rf $yamlnew
$0 webget $yamlnew $Https 0 0 0 1 $0 webget $yamlnew $Https
if [ "$?" = "1" ];then if [ "$?" = "1" ];then
if [ -z "$markhttp" ];then if [ -z "$markhttp" ];then
echo ----------------------------------------------- echo -----------------------------------------------
@@ -190,8 +190,16 @@ EOF`
echo ----------------------------------------------- echo -----------------------------------------------
exit 1 exit 1
fi fi
#检测vless协议
if [ -n "$(cat $yamlnew | grep -E 'vless')" ] && [ "$clashcore" = "clash" -o "$clashcore" = "clashpre" ];then
echo -----------------------------------------------
logger "检测到vless协议！将改为使用clash.meta核心启动！" 33
rm -rf $bindir/clash
setconfig clashcore clash.meta
echo -----------------------------------------------
fi
#检测是否存在高级版规则 #检测是否存在高级版规则
if [ "$clashcore" = "clash" -a -n "$(cat $yamlnew | grep -E '^script:|proxy-providers|rule-providers|vless')" ];then if [ "$clashcore" = "clash" -a -n "$(cat $yamlnew | grep -E '^script:|proxy-providers|rule-providers')" ];then
echo ----------------------------------------------- echo -----------------------------------------------
logger "检测到高级版核心专属规则！将改为使用clash.net核心启动！" 33 logger "检测到高级版核心专属规则！将改为使用clash.net核心启动！" 33
rm -rf $bindir/clash rm -rf $bindir/clash
@@ -832,7 +840,7 @@ webget)
[ "$6" = "skipceroff" ] && certificate='' || certificate='-k' [ "$6" = "skipceroff" ] && certificate='' || certificate='-k'
#[ -n "$7" ] && agent='-A "clash"' #[ -n "$7" ] && agent='-A "clash"'
result=$(curl $agent -w %{http_code} --connect-timeout 3 $progress $redirect $certificate -o "$2" "$3") result=$(curl $agent -w %{http_code} --connect-timeout 3 $progress $redirect $certificate -o "$2" "$3")
[ "$?" != "0" ] && export all_proxy="" && result=$(curl $agent -w %{http_code} --connect-timeout 3 $progress $redirect $certificate -o "$2" "$3") [ "$result" != "200" ] && export all_proxy="" && result=$(curl $agent -w %{http_code} --connect-timeout 3 $progress $redirect $certificate -o "$2" "$3")
else else
if wget --version > /dev/null 2>&1;then if wget --version > /dev/null 2>&1;then
[ "$4" = "echooff" ] && progress='-q' || progress='-q --show-progress' [ "$4" = "echooff" ] && progress='-q' || progress='-q --show-progress'