~修复新手引导按提示开启小闪存但后续扔继续提示的bug
~移除了clash系内核在线获取配置文件时调用内核进行校验的机制
This commit is contained in:
juewuy 2024-01-15 18:22:14 +08:00
parent 8abdab8843
commit 705ed82396
7 changed files with 6 additions and 13 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -5,4 +5,4 @@ meta_v=v1.18.0
singbox_v=1.7.8
GeoIP_v=20240107
versionsh=1.8.7b
versionsh=1.8.7c

View File

@ -1756,7 +1756,10 @@ userguide(){
echo -e "\033[0m每次开机后首次运行服务时都会自动的重新下载相关文件\033[0m"
echo -----------------------------------------------
read -p "是否开启?(1/0) > " res
[ "$res" = 1 ] && setconfig BINDIR /tmp/ShellCrash ${CRASHDIR}/configs/command.env
[ "$res" = 1 ] && {
BINDIR=/tmp/ShellCrash
setconfig BINDIR /tmp/ShellCrash ${CRASHDIR}/configs/command.env
}
fi
#检测及下载根证书
if [ -d /etc/ssl/certs -a ! -f '/etc/ssl/certs/ca-certificates.crt' ];then

View File

@ -1,7 +1,7 @@
#!/bin/sh
# Copyright (C) Juewuy
version=1.8.7b
version=1.8.7c
setdir(){
dir_avail(){

View File

@ -213,16 +213,6 @@ check_clash_config(){ #检查clash配置文件
done < ${TMPDIR}/clash_proxies_$USER
rm -rf ${TMPDIR}/clash_proxies_$USER
}
#使用核心内置test功能检测
if [ -x ${BINDIR}/CrashCore ];then
${BINDIR}/CrashCore -t -d ${BINDIR} -f $core_config_new >/dev/null
if [ "$?" != "0" ];then
logger "配置文件加载失败!请查看报错信息!" 31
${BINDIR}/CrashCore -t -d ${BINDIR} -f $core_config_new
echo "$($BINDIR/CrashCore -t -d $BINDIR -f $core_config_new)" >> ${TMPDIR}/ShellCrash.log
exit 1
fi
fi
}
check_singbox_config(){ #检查singbox配置文件
#使用核心内置format功能检测并格式化