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

v1.3.11-test

Browse Source 
~绕过内核功能ipset模块检测修复
~优化对低版本wget命令的支持
~暂时屏蔽对dler.io的特殊处理
~精简部分代码
~修复部分情况无法正常检查更新的bug
This commit is contained in:
juewuy
2021-06-17 18:23:48 +08:00
parent 2c1dfada01
commit 608337ffb2
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/clashfm.tar.gz
View File

Binary file not shown.

2
bin/version
View File

@@ -1,4 +1,4 @@
clash_v=1.6.0 clash_v=1.6.0
clashpre_v=2021.05.08 clashpre_v=2021.05.08
GeoIP_v=20210611 GeoIP_v=20210611
versionsh=1.3.10 versionsh=1.3.11

8
scripts/start.sh
View File

@@ -48,7 +48,8 @@ compare(){
fi fi
} }
webget(){ webget(){
[ -n "$(pidof clash)" ] && export all_proxy="http://$authentication@127.0.0.1:$mix_port" #设置临时http代理 #设置临时http代理
[ -n "$(pidof clash)" ] && getconfig && export all_proxy="http://$authentication@127.0.0.1:$mix_port"
#参数【$1】代表下载目录，【$2】代表在线地址 #参数【$1】代表下载目录，【$2】代表在线地址
#参数【$3】代表输出显示，【$4】不启用重定向 #参数【$3】代表输出显示，【$4】不启用重定向
#参数【$5】代表验证证书，【$6】使用clash文件头 #参数【$5】代表验证证书，【$6】使用clash文件头
@@ -71,14 +72,13 @@ webget(){
[ -n "$6" ] && agent='--user-agent="clash"' [ -n "$6" ] && agent='--user-agent="clash"'
wget -Y on $agent $progress $redirect $certificate $timeout -O $1 $2 wget -Y on $agent $progress $redirect $certificate $timeout -O $1 $2
if [ "$?" != "0" ];then if [ "$?" != "0" ];then
wget $agent $progress $redirect $certificate $timeout -O $1 $2 wget -Y off $agent $progress $redirect $certificate $timeout -O $1 $2
[ "$?" = "0" ] && result="200" [ "$?" = "0" ] && result="200"
else else
result="200" result="200"
fi fi
fi fi
export all_proxy="" [ "$result" = "200" ] || exit 1
[ "$result" = "200" ] && return 0 || return 1
} }
logger(){ logger(){
[ -n "$2" ] && echo -e "\033[$2m$1\033[0m" [ -n "$2" ] && echo -e "\033[$2m$1\033[0m"