v1.8.8c
~自定义内核列表增加了PuerNya版本singbox内核,支持ssr、providers ~切换版本时,会自动切换不可用源至默认源 ~修复b版本面板节点无法正确还原的bug ~修复触发自动下载meta内核时意外报错的bug ~修复触发自动下载时首次启动失败的bug
This commit is contained in:
@@ -136,7 +136,7 @@ get_save(){ #获取面板信息
|
||||
fi
|
||||
}
|
||||
put_save(){ #推送面板选择
|
||||
[ -z "$3" ] && request_type=GET || request_type=$3
|
||||
[ -z "$3" ] && request_type=PUT || request_type=$3
|
||||
if curl --version > /dev/null 2>&1;then
|
||||
curl -sS -X ${request_type} -H "Authorization: Bearer ${secret}" -H "Content-Type:application/json" "$1" -d "$2" >/dev/null
|
||||
elif wget --version > /dev/null 2>&1;then
|
||||
@@ -269,7 +269,7 @@ get_core_config(){ #下载内核配置文件
|
||||
else
|
||||
if [ "$retry" = 4 ];then
|
||||
logger "无法获取配置文件,请检查链接格式以及网络连接状态!" 31
|
||||
echo -e "\033[32m也可用浏览器下载以上链接后,使用WinSCP手动上传到/tmp目录后执行crash命令!\033[0m"
|
||||
echo -e "\033[32m也可用浏览器下载以上链接后,使用WinSCP手动上传到/tmp目录后执行crash命令本地导入!\033[0m"
|
||||
exit 1
|
||||
elif [ "$retry" = 3 ];then
|
||||
retry=4
|
||||
@@ -1409,16 +1409,16 @@ core_check(){
|
||||
core_v=$(${TMPDIR}/core.new version 2>/dev/null | grep version | awk '{print $3}')
|
||||
COMMAND='"$BINDIR/CrashCore run -D $BINDIR -c $TMPDIR/config.json"'
|
||||
else
|
||||
core_v=$(${TMPDIR}/core.new -v 2>/dev/null | sed 's/ linux.*//;s/.* //')
|
||||
core_v=$(${TMPDIR}/core.new -v 2>/dev/null | grep linux | sed 's/ linux.*//;s/.* //')
|
||||
COMMAND='"$BINDIR/CrashCore -d $BINDIR -f $TMPDIR/config.yaml"'
|
||||
fi
|
||||
setconfig COMMAND "$COMMAND" ${CRASHDIR}/configs/command.env
|
||||
if [ -z "$core_v" ];then
|
||||
rm -rf ${TMPDIR}/core.new
|
||||
logger "核心下载失败,请重新运行或更换安装源!" 31
|
||||
exit 1
|
||||
else
|
||||
mv -f ${TMPDIR}/core.new ${BINDIR}/CrashCore
|
||||
setconfig COMMAND "$COMMAND" ${CRASHDIR}/configs/command.env && source ${CRASHDIR}/configs/command.env
|
||||
setconfig crashcore $crashcore
|
||||
setconfig core_v $core_v
|
||||
fi
|
||||
@@ -1474,8 +1474,7 @@ singbox_check(){ #singbox启动前检查
|
||||
#检测SSR节点
|
||||
if [ -n "$(cat $core_config | grep -oE '"shadowsocksr"')" ];then
|
||||
echo -----------------------------------------------
|
||||
logger "singbox以移除对SSR相关协议的支持,请使用clash系内核!" 33
|
||||
exit 1
|
||||
logger "singbox以移除对SSR相关协议的支持,请使用clash系内核或者PuerNya分支!" 33
|
||||
fi
|
||||
core_check
|
||||
#预下载GeoIP数据库
|
||||
|
||||
Reference in New Issue
Block a user