~增加小米设备对autossh脚本的兼容
~增加小米设备/data/auto_start.sh文件,用于自定义开机启动项 ~增加Mihomo内核默认启用统一延迟功能 ~优化默认DNS,现在会默认使用localhost(如果可用)而不是阿里dns ~优化子菜单加载效率 ~优化部分设备的tun加载流程,修复因为未加载tun模块而导致的启动报错 ~优化dns界面显示 ~修复因为文件拆分路径改变导致的加载失败的一系列bug ~修复局域网过滤白名单失效的bug(需要重新启用) ~修复自定义入站启用失败的bug ~修复前台测试内核运行命令报错的bug ~修复卸载时的意外报错
This commit is contained in:
@@ -129,6 +129,8 @@ fi
|
||||
echo "shellcrash:x:0:7890:::" >>/etc/passwd
|
||||
fi
|
||||
}
|
||||
#加载系统内核组件
|
||||
[ "$redir_mod" = "Tun模式" -o "$redir_mod" = "混合模式" ] && ckcmd modprobe && modprobe tun 2>/dev/null
|
||||
#清理debug日志
|
||||
rm -rf /tmp/ShellCrash/debug.log
|
||||
rm -rf "$CRASHDIR"/debug.log
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
#!/bin/sh
|
||||
# Copyright (C) Juewuy
|
||||
|
||||
#默认dns
|
||||
[ -z "$dns_nameserver" ] && dns_nameserver='223.5.5.5, 1.2.4.8'
|
||||
[ -z "$dns_fallback" ] && dns_fallback="1.1.1.1, 8.8.8.8"
|
||||
[ -z "$dns_resolver" ] && dns_resolver="223.5.5.5, 2400:3200::1"
|
||||
#修饰clash配置文件
|
||||
modify_yaml() {
|
||||
##########需要变更的配置###########
|
||||
@@ -80,6 +76,7 @@ $exper
|
||||
$sniffer_set
|
||||
$find_process
|
||||
routing-mark: $routing_mark
|
||||
unified-delay: true
|
||||
EOF
|
||||
#读取本机hosts并生成配置文件
|
||||
if [ "$hosts_opt" != "OFF" ] && [ -z "$(grep -aE '^hosts:' "$CRASHDIR"/yamls/user.yaml 2>/dev/null)" ]; then
|
||||
@@ -198,7 +195,7 @@ EOF
|
||||
yaml_user="$CRASHDIR"/yamls/user.yaml
|
||||
#set和user去重,且优先使用user.yaml
|
||||
cp -f "$TMPDIR"/set.yaml "$TMPDIR"/set_bak.yaml
|
||||
for char in mode allow-lan log-level tun experimental external-ui-url interface-name dns store-selected; do
|
||||
for char in mode allow-lan log-level tun experimental external-ui-url interface-name dns store-selected unified-delay; do
|
||||
[ -n "$(grep -E "^$char" $yaml_user)" ] && sed -i "/^$char/d" "$TMPDIR"/set.yaml
|
||||
done
|
||||
}
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
#!/bin/sh
|
||||
# Copyright (C) Juewuy
|
||||
|
||||
#默认dns
|
||||
[ -z "$dns_nameserver" ] && dns_nameserver='223.5.5.5'
|
||||
[ -z "$dns_fallback" ] && dns_fallback="1.1.1.1"
|
||||
[ -z "$dns_resolver" ] && dns_resolver="223.5.5.5"
|
||||
#修饰singbox配置文件
|
||||
parse_singbox_dns() { #dns转换
|
||||
first_dns=$(echo "$1" | cut -d',' -f1 | cut -d' ' -f1)
|
||||
|
||||
@@ -68,6 +68,10 @@ auto_start(){
|
||||
"$CRASHDIR"/start.sh start
|
||||
/etc/init.d/shellcrash enable
|
||||
fi
|
||||
#启动自定义服务
|
||||
[ -s /data/auto_start.sh ] && /data/auto_start.sh &
|
||||
#兼容auto_ssh脚本
|
||||
[ -s /data/auto_ssh/auto_ssh.sh ] && /bin/sh /data/auto_ssh/auto_ssh.sh &
|
||||
}
|
||||
init(){
|
||||
#等待启动完成
|
||||
|
||||
Reference in New Issue
Block a user