From 3a311d42b90d6d8b263a115d7779c33096c982de Mon Sep 17 00:00:00 2001 From: juewuy Date: Wed, 6 Mar 2024 15:58:59 +0800 Subject: [PATCH] =?UTF-8?q?~=E7=A7=BB=E9=99=A4=E5=9C=A8=E7=BA=BF=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E6=8F=90=E7=A4=BA=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=B5=8F?= =?UTF-8?q?=E8=A7=88=E5=99=A8=E7=BC=93=E5=AD=98=20~=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0=E8=84=9A=E6=9C=AC=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=97=A0=E6=B3=95=E6=AD=A3=E7=A1=AE=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E7=9A=84bug=20~=E4=BF=AE=E5=A4=8D=E5=90=AF=E5=8A=A8=E6=97=B6?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=87=E6=8D=A2=E5=86=85=E6=A0=B8=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E6=B3=95=E6=AD=A3=E7=A1=AE=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=86=85=E6=A0=B8=E7=B1=BB=E5=9E=8B=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/task.list | 2 +- scripts/getdate.sh | 1 - scripts/start.sh | 46 +++++++++++++++++----------------------------- scripts/task.sh | 2 +- 4 files changed, 19 insertions(+), 32 deletions(-) diff --git a/public/task.list b/public/task.list index 63b7317..09ac75f 100644 --- a/public/task.list +++ b/public/task.list @@ -9,7 +9,7 @@ 107#$CRASHDIR/task/task.sh ntp#自动同步ntp时间 111#$CRASHDIR/task/task.sh update_core#自动更新内核 -112#$CRASHDIR/task/task.sh update_shellclash#自动更新脚本 +112#$CRASHDIR/task/task.sh update_scripts#自动更新脚本 113#$CRASHDIR/task/task.sh update_mmdb#自动更新数据库文件 121#$CRASHDIR/task/task.sh reset_firewall#重设透明路由防火墙 diff --git a/scripts/getdate.sh b/scripts/getdate.sh index eb2fb99..8578d8b 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -2054,7 +2054,6 @@ checkupdate(){ [ "$?" = "0" ] && version_new=$(cat ${TMPDIR}/version_new | grep -oE 'versionsh=.*' | awk -F'=' '{ print $2 }') if [ -n "$version_new" ];then source ${TMPDIR}/version_new 2>/dev/null - cat ${TMPDIR}/version_new else echo -e "\033[31m检查更新失败！请尝试切换其他安装源！\033[0m" setserver diff --git a/scripts/start.sh b/scripts/start.sh index 7049258..8964eb8 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -1464,6 +1464,9 @@ makehtml(){ #生成面板跳转文件 cat > ${BINDIR}/ui/index.html < + + + @@ -1477,7 +1480,7 @@ makehtml(){ #生成面板跳转文件 Meta XD面板(推荐)
 Meta YACD面板(推荐)
 Clash YACD面板
 -
如已安装，请使用Ctrl+F5强制刷新！
 +
如已安装，请刷新此页面！
 /dev/null #修复SELinux权限问题 return 0 } +core_exchange(){ #升级为高级内核 + #$1：目标内核 $2：提示语句 + logger "检测到${2}！将改为使用${1}核心启动！" 33 + rm -rf ${TMPDIR}/CrashCore + rm -rf ${BINDIR}/CrashCore + rm -rf ${BINDIR}/CrashCore.tar.gz + crashcore=${1} + setconfig crashcore ${1} + echo ----------------------------------------------- +} clash_check(){ #clash启动前检查 #检测vless/hysteria协议 - if [ "$crashcore" != "meta" ] && [ -n "$(cat $core_config | grep -oE 'type: vless|type: hysteria')" ];then - echo ----------------------------------------------- - logger "检测到vless/hysteria协议！将改为使用meta核心启动！" 33 - rm -rf ${TMPDIR}/CrashCore - rm -rf ${BINDIR}/CrashCore - rm -rf ${BINDIR}/CrashCore.tar.gz - crashcore=meta - setconfig crashcore $crashcore - echo ----------------------------------------------- - fi + [ "$crashcore" != "meta" ] && [ -n "$(cat $core_config | grep -oE 'type: vless|type: hysteria')" ] && core_exchange meta 'vless/hy协议' #检测是否存在高级版规则或者tun模式 if [ "$crashcore" = "clash" ];then [ -n "$(cat $core_config | grep -aiE '^script:|proxy-providers|rule-providers|rule-set')" ] || \ [ "$redir_mod" = "混合模式" ] || \ - [ "$redir_mod" = "Tun模式" ] && { - echo ----------------------------------------------- - logger "检测到高级功能！将改为使用meta核心启动！" 33 - rm -rf ${TMPDIR}/CrashCore - rm -rf ${BINDIR}/CrashCore - rm -rf ${BINDIR}/CrashCore.tar.gz - crashcore=meta - echo ----------------------------------------------- - } + [ "$redir_mod" = "Tun模式" ] && core_exchange meta '当前内核不支持的配置' fi core_check #预下载GeoIP数据库 @@ -1588,15 +1584,7 @@ clash_check(){ #clash启动前检查 } singbox_check(){ #singbox启动前检查 #检测PuerNya专属功能 - if [ "$crashcore" != "singboxp" ] && [ -n "$(cat ${CRASHDIR}/jsons/*.json | grep -oE 'shadowsocksr|providers')" ];then - echo ----------------------------------------------- - logger "检测到PuerNya内核专属功能，改为使用singboxp内核启动！" 33 - rm -rf ${TMPDIR}/CrashCore - rm -rf ${BINDIR}/CrashCore - rm -rf ${BINDIR}/CrashCore.tar.gz - crashcore=singboxp - setconfig crashcore $crashcore - fi + [ "$crashcore" != "singboxp" ] && [ -n "$(cat ${CRASHDIR}/jsons/*.json | grep -oE 'shadowsocksr|providers')" ] && core_exchange singboxp 'PuerNya内核专属功能' core_check #预下载geoip-cn.srs数据库 [ -n "$(cat ${CRASHDIR}/jsons/*.json | grep -oEi '"rule_set" *: *"geoip-cn"')" ] && ckgeo geoip-cn.srs srs_geoip_cn.srs diff --git a/scripts/task.sh b/scripts/task.sh index 59c755e..bd02cd5 100644 --- a/scripts/task.sh +++ b/scripts/task.sh @@ -86,7 +86,7 @@ update_core(){ #自动更新内核 fi fi } -update_shellcrash(){ #自动更新脚本 +update_scripts(){ #自动更新脚本 #检查版本 check_update if [ -z "$versionsh" -o "$versionsh" = "versionsh_l" ];then