diff --git a/.github/workflows/update_meta_core.yaml b/.github/workflows/update_meta_core.yaml index 923897bc..9f6c58a7 100644 --- a/.github/workflows/update_meta_core.yaml +++ b/.github/workflows/update_meta_core.yaml @@ -176,7 +176,7 @@ jobs: - name: Zip core by tar run: | - for arch in amd64 armv5 armv7 arm64 mips-softfloat mipsle-hardfloat mipsle-softfloat;do + for arch in amd64 armv5 armv7 arm64 386 mips-softfloat mipsle-hardfloat mipsle-softfloat;do [ ! -f ./tmp/linux-${arch}/meta ] && continue mv -f ./tmp/linux-${arch}/meta ./tmp/CrashCore chmod +x ./tmp/CrashCore diff --git a/.github/workflows/update_singbox_core.yaml b/.github/workflows/update_singbox_core.yaml index 120a9ed8..c080b5de 100644 --- a/.github/workflows/update_singbox_core.yaml +++ b/.github/workflows/update_singbox_core.yaml @@ -196,7 +196,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 386 mips-softfloat mipsel-hardfloat mipsel-softfloat;do [ ! -f ./tmp/linux-${arch}/sing-box ] && continue mv -f ./tmp/linux-${arch}/sing-box ./tmp/CrashCore chmod +x ./tmp/CrashCore diff --git a/scripts/init.sh b/scripts/init.sh index e8f99a66..060a855f 100644 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -174,9 +174,12 @@ setconfig() { #脚本配置工具 [ -f "/data/etc/crontabs/root" ] && systype=mi_snapshot #小米设备 [ -w "/var/mnt/cfg/firewall" ] && systype=ng_snapshot #NETGEAR设备 #容器内环境 -grep -qE '/(docker|lxc|kubepods|crio|containerd)/' /proc/1/cgroup || [ -f /run/.containerenv ] || [ -f /.dockerenv ] && systype=container +grep -qE '/(docker|lxc|kubepods|crio|containerd)/' /proc/1/cgroup || [ -f /run/.containerenv ] || [ -f /.dockerenv ] && { + systype='container' + CRASHDIR='/etc/ShellCrash' +} #检查环境变量 -[ -z "$CRASHDIR" -a -n "$clashdir" ] && CRASHDIR=$clashdir +[ -z "$CRASHDIR" -a -n "$clashdir" ] && CRASHDIR="$clashdir" [ -z "$CRASHDIR" -a -d /tmp/SC_tmp ] && setdir #移动文件 mkdir -p ${CRASHDIR}