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

v1.7.0

Browse Source 
~正式版打包
~合并https://github.com/juewuy/ShellClash/pull/309
This commit is contained in:
juewuy
2023-01-23 15:38:07 +08:00
parent fd57de5861
commit dc539cb51d
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/ShellClash.tar.gz
View File

Binary file not shown.

BIN
bin/clashfm.tar.gz
View File

Binary file not shown.

2
bin/version
View File

@@ -2,5 +2,5 @@ clashnet_v=v1.7.6
clashpre_v=2022.11.25 clashpre_v=2022.11.25
clash_v=v1.7.1 clash_v=v1.7.1
meta_v=v1.13.2 meta_v=v1.13.2
versionsh=1.6.16d
GeoIP_v=20230121 GeoIP_v=20230121
versionsh=1.7.0

5
scripts/start.sh
View File

@@ -949,6 +949,7 @@ stop_firewall(){
ip6tables -t nat -F clashv6 2> /dev/null ip6tables -t nat -F clashv6 2> /dev/null
ip6tables -t nat -X clashv6 2> /dev/null ip6tables -t nat -X clashv6 2> /dev/null
#dns #dns
ip6tables -t nat -D PREROUTING -p udp --dport 53 -j clashv6_dns 2>/dev/null
ip6tables -t nat -F clashv6_dns 2> /dev/null ip6tables -t nat -F clashv6_dns 2> /dev/null
ip6tables -t nat -X clashv6_dns 2> /dev/null ip6tables -t nat -X clashv6_dns 2> /dev/null
#tun #tun
@@ -1363,12 +1364,11 @@ webget)
fi fi
#参数【$2】代表下载目录，【$3】代表在线地址 #参数【$2】代表下载目录，【$3】代表在线地址
#参数【$4】代表输出显示，【$4】不启用重定向 #参数【$4】代表输出显示，【$4】不启用重定向
#参数【$6】代表验证证书，【$7】使用clash文件头 #参数【$6】代表验证证书
if curl --version > /dev/null 2>&1;then if curl --version > /dev/null 2>&1;then
[ "$4" = "echooff" ] && progress='-s' || progress='-#' [ "$4" = "echooff" ] && progress='-s' || progress='-#'
[ "$5" = "rediroff" ] && redirect='' || redirect='-L' [ "$5" = "rediroff" ] && redirect='' || redirect='-L'
[ "$6" = "skipceroff" ] && certificate='' || certificate='-k' [ "$6" = "skipceroff" ] && certificate='' || certificate='-k'
#[ -n "$7" ] && agent='-A "clash"'
result=$(curl $agent -w %{http_code} --connect-timeout 3 $progress $redirect $certificate -o "$2" "$url") result=$(curl $agent -w %{http_code} --connect-timeout 3 $progress $redirect $certificate -o "$2" "$url")
[ "$result" != "200" ] && export https_proxy="" && result=$(curl $agent -w %{http_code} --connect-timeout 3 $progress $redirect $certificate -o "$2" "$3") [ "$result" != "200" ] && export https_proxy="" && result=$(curl $agent -w %{http_code} --connect-timeout 3 $progress $redirect $certificate -o "$2" "$3")
else else
@@ -1377,7 +1377,6 @@ webget)
[ "$5" = "rediroff" ] && redirect='--max-redirect=0' || redirect='' [ "$5" = "rediroff" ] && redirect='--max-redirect=0' || redirect=''
[ "$6" = "skipceroff" ] && certificate='' || certificate='--no-check-certificate' [ "$6" = "skipceroff" ] && certificate='' || certificate='--no-check-certificate'
timeout='--timeout=3 -t 2' timeout='--timeout=3 -t 2'
#[ -n "$7" ] && agent='--user-agent="clash"'
fi fi
[ "$4" = "echoon" ] && progress='' [ "$4" = "echoon" ] && progress=''
[ "$4" = "echooff" ] && progress='-q' [ "$4" = "echooff" ] && progress='-q'