diff --git a/.github/workflows/update_meta_core.yaml b/.github/workflows/update_meta_core.yaml index 0c3a293..4bb8665 100644 --- a/.github/workflows/update_meta_core.yaml +++ b/.github/workflows/update_meta_core.yaml @@ -89,11 +89,11 @@ jobs: goos: linux goarch: mips gomips: softfloat - - name: linux-mipsel-softfloat + - name: linux-mipsle-softfloat goos: linux goarch: mipsle gomips: softfloat - - name: linux-mipsel-hardfloat + - name: linux-mipsle-hardfloat goos: linux goarch: mipsle gomips: hardfloat @@ -163,7 +163,7 @@ jobs: - name: Zip core by tar run: | - for arch in amd64 armv5 armv7 arm64 mips-softfloat mipsel-hardfloat mipsel-softfloat;do + for arch in amd64 armv5 armv7 arm64 mips-softfloat mipsle-hardfloat mipsle-softfloat;do mv -f ./tmp/linux-${arch}/meta ./tmp/CrashCore chmod +x ./tmp/CrashCore tar --no-same-owner -zcvf ./tmp/clash-linux-${arch}.tar.gz -C ./tmp CrashCore diff --git a/bin/ShellCrash.tar.gz b/bin/ShellCrash.tar.gz index 6b4318a..e9656a9 100644 Binary files a/bin/ShellCrash.tar.gz and b/bin/ShellCrash.tar.gz differ diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index bfa4208..aab1fe0 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/bin/meta/clash-linux-amd64.tar.gz b/bin/meta/clash-linux-amd64.tar.gz index 37932a5..2b892db 100644 Binary files a/bin/meta/clash-linux-amd64.tar.gz and b/bin/meta/clash-linux-amd64.tar.gz differ diff --git a/bin/meta/clash-linux-arm64.tar.gz b/bin/meta/clash-linux-arm64.tar.gz index 3295d14..01167d2 100644 Binary files a/bin/meta/clash-linux-arm64.tar.gz and b/bin/meta/clash-linux-arm64.tar.gz differ diff --git a/bin/meta/clash-linux-armv5.tar.gz b/bin/meta/clash-linux-armv5.tar.gz index 17a90a0..b5fa1eb 100644 Binary files a/bin/meta/clash-linux-armv5.tar.gz and b/bin/meta/clash-linux-armv5.tar.gz differ diff --git a/bin/meta/clash-linux-armv7.tar.gz b/bin/meta/clash-linux-armv7.tar.gz index c446d6f..19349fa 100644 Binary files a/bin/meta/clash-linux-armv7.tar.gz and b/bin/meta/clash-linux-armv7.tar.gz differ diff --git a/bin/meta/clash-linux-mips-softfloat.tar.gz b/bin/meta/clash-linux-mips-softfloat.tar.gz index 3459675..2e2ab19 100644 Binary files a/bin/meta/clash-linux-mips-softfloat.tar.gz and b/bin/meta/clash-linux-mips-softfloat.tar.gz differ diff --git a/bin/meta/clash-linux-mipsel-hardfloat.tar.gz b/bin/meta/clash-linux-mipsel-hardfloat.tar.gz deleted file mode 100644 index 04186b6..0000000 Binary files a/bin/meta/clash-linux-mipsel-hardfloat.tar.gz and /dev/null differ diff --git a/bin/meta/clash-linux-mipsel-softfloat.tar.gz b/bin/meta/clash-linux-mipsel-softfloat.tar.gz deleted file mode 100644 index 7b1fb0b..0000000 Binary files a/bin/meta/clash-linux-mipsel-softfloat.tar.gz and /dev/null differ diff --git a/bin/meta/clash-linux-mipsle-hardfloat.tar.gz b/bin/meta/clash-linux-mipsle-hardfloat.tar.gz new file mode 100644 index 0000000..25c3d78 Binary files /dev/null and b/bin/meta/clash-linux-mipsle-hardfloat.tar.gz differ diff --git a/bin/meta/clash-linux-mipsle-softfloat.tar.gz b/bin/meta/clash-linux-mipsle-softfloat.tar.gz new file mode 100644 index 0000000..3a9e74c Binary files /dev/null and b/bin/meta/clash-linux-mipsle-softfloat.tar.gz differ diff --git a/bin/public.tar.gz b/bin/public.tar.gz index 0023f99..77afc67 100644 Binary files a/bin/public.tar.gz and b/bin/public.tar.gz differ diff --git a/bin/singbox/singbox-linux-amd64.tar.gz b/bin/singbox/singbox-linux-amd64.tar.gz index f00ac92..b844618 100644 Binary files a/bin/singbox/singbox-linux-amd64.tar.gz and b/bin/singbox/singbox-linux-amd64.tar.gz differ diff --git a/bin/singbox/singbox-linux-arm64.tar.gz b/bin/singbox/singbox-linux-arm64.tar.gz index fc7a1ad..8792779 100644 Binary files a/bin/singbox/singbox-linux-arm64.tar.gz and b/bin/singbox/singbox-linux-arm64.tar.gz differ diff --git a/bin/singbox/singbox-linux-armv5.tar.gz b/bin/singbox/singbox-linux-armv5.tar.gz index 2b43e61..d4379b1 100644 Binary files a/bin/singbox/singbox-linux-armv5.tar.gz and b/bin/singbox/singbox-linux-armv5.tar.gz differ diff --git a/bin/singbox/singbox-linux-armv7.tar.gz b/bin/singbox/singbox-linux-armv7.tar.gz index 9db3b6c..0ed8d27 100644 Binary files a/bin/singbox/singbox-linux-armv7.tar.gz and b/bin/singbox/singbox-linux-armv7.tar.gz differ diff --git a/bin/singbox/singbox-linux-mips-softfloat.tar.gz b/bin/singbox/singbox-linux-mips-softfloat.tar.gz index 76bd691..cf9a109 100644 Binary files a/bin/singbox/singbox-linux-mips-softfloat.tar.gz and b/bin/singbox/singbox-linux-mips-softfloat.tar.gz differ diff --git a/bin/singbox/singbox-linux-mipsle-hardfloat.tar.gz b/bin/singbox/singbox-linux-mipsle-hardfloat.tar.gz index 671b03f..347854b 100644 Binary files a/bin/singbox/singbox-linux-mipsle-hardfloat.tar.gz and b/bin/singbox/singbox-linux-mipsle-hardfloat.tar.gz differ diff --git a/bin/singbox/singbox-linux-mipsle-softfloat.tar.gz b/bin/singbox/singbox-linux-mipsle-softfloat.tar.gz index 7b35fb1..43fea3d 100644 Binary files a/bin/singbox/singbox-linux-mipsle-softfloat.tar.gz and b/bin/singbox/singbox-linux-mipsle-softfloat.tar.gz differ diff --git a/bin/version b/bin/version index ceb679c..6c6df83 100644 --- a/bin/version +++ b/bin/version @@ -1,8 +1,8 @@ clashnet_v=v1.7.6 clashpre_v=2022.11.25 clash_v=v1.7.1 -meta_v=v1.18.0 +meta_v=v1.18.1 singboxp_v=1.8.5-73d97226 -singbox_v=1.8.5 +singbox_v=1.8.8 versionsh=1.9.0pre14 GeoIP_v=20240302 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/init.sh b/scripts/init.sh index c6a2b2a..33fde42 100644 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) Juewuy -version=1.9.0pre14 +version=1.9.0pre15 setdir(){ dir_avail(){ diff --git a/scripts/start.sh b/scripts/start.sh index 4d608a4..e31da29 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -318,7 +318,11 @@ get_core_config(){ #下载内核配置文件 fi else Https="" - [ "$crashcore" = singbox -o "$crashcore" = singboxp ] && check_singbox_config || check_clash_config + if [ "$crashcore" = singbox -o "$crashcore" = singboxp ];then + check_singbox_config + else + check_clash_config + fi #如果不同则备份并替换文件 if [ -s $core_config ];then compare $core_config_new $core_config @@ -1420,6 +1424,9 @@ makehtml(){ #生成面板跳转文件 cat > ${BINDIR}/ui/index.html < + + + @@ -1433,7 +1440,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数据库 @@ -1544,15 +1544,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