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

v1.7.10g

Browse Source 
~尝试修复ipv6无法正常代理的bug
~尝试修复标准linux系统开机启动时无法正确生成配置文件的bug
~修复部分中文系统无法正确获取安装目录剩余空间的问题
~修复卸载时的报错问题
~修复使用最新meta内核时无法正确保存面板节点选择的问题
This commit is contained in:
juewuy
2023-08-07 22:09:41 +08:00
parent 70f88b13ed
commit e5e2e873c9
11 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/start.sh
View File

@@ -141,10 +141,10 @@ mark_time(){
getlanip(){
i=1
while [ "$i" -le "10" ];do
[ -f $TMPDIR/ShellClash_log ] && break
host_ipv4=$(ip a 2>&1 | grep -w 'inet' | grep 'global' | grep 'br' | grep -Ev 'iot|metric' | grep -E ' 1(92|0|72)\.' | sed 's/.*inet.//g' | sed 's/br.*$//g' ) #ipv4局域网网段
host_ipv6=$(ip a 2>&1 | grep -w 'inet6' | grep -E 'global' | sed 's/.*inet6.//g' | sed 's/scope.*$//g' ) #ipv6公网地址段
[ -n "$host_ipv4" -o -n "$host_ipv6" ] && break
[ "$ipv6_redir" = "已开启" ] && host_ipv6=$(ip a 2>&1 | grep -w 'inet6' | grep -E 'global' | sed 's/.*inet6.//g' | sed 's/scope.*$//g' ) #ipv6公网地址段
[ -f $TMPDIR/ShellClash_log ] && break
[ -n "$host_ipv4" -a -n "$host_ipv6" ] && break
sleep 2 && i=$((i+1))
done
#添加自定义ipv4局域网网段
@@ -1041,7 +1041,7 @@ stop_firewall(){
#面板配置保存相关
web_save(){
#使用get_save获取面板节点设置
get_save http://127.0.0.1:${db_port}/proxies | awk -F "{" '{for(i=1;i<=NF;i++) print $i}' | grep -aE '^"all".*"Selector"' > $TMPDIR/clash_web_check_$USER
get_save http://127.0.0.1:${db_port}/proxies | awk -F ':\\{"' '{for(i=1;i<=NF;i++) print $i}' | grep -aE '^all".*"Selector"' > $TMPDIR/clash_web_check_$USER
while read line ;do
def=$(echo $line | awk -F "[[,]" '{print $2}')
now=$(echo $line | grep -oE '"now".*",' | sed 's/"now"://g' | sed 's/"type":.*//g' | sed 's/,//g')