xm/ShellCrash
1
0
Fork 0
mirror of https://github.com/juewuy/ShellCrash.git synced 2026-03-12 00:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

~优化docker适配

Browse Source 
~修复386内核没有被正确编译打包的bug
This commit is contained in:
juewuy
2025-12-16 17:38:17 +08:00
parent 6925328554
commit f720451c2e
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/update_meta_core.yaml vendored
View File

@@ -176,7 +176,7 @@ jobs:
- name: Zip core by tar - name: Zip core by tar
run: | 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 [ ! -f ./tmp/linux-${arch}/meta ] && continue
mv -f ./tmp/linux-${arch}/meta ./tmp/CrashCore mv -f ./tmp/linux-${arch}/meta ./tmp/CrashCore
chmod +x ./tmp/CrashCore chmod +x ./tmp/CrashCore

2
.github/workflows/update_singbox_core.yaml vendored
View File

@@ -196,7 +196,7 @@ jobs:
- name: Zip core by tar - name: Zip core by tar
run: | 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 [ ! -f ./tmp/linux-${arch}/sing-box ] && continue
mv -f ./tmp/linux-${arch}/sing-box ./tmp/CrashCore mv -f ./tmp/linux-${arch}/sing-box ./tmp/CrashCore
chmod +x ./tmp/CrashCore chmod +x ./tmp/CrashCore

7
scripts/init.sh
View File

@@ -174,9 +174,12 @@ setconfig() { #脚本配置工具
[ -f "/data/etc/crontabs/root" ] && systype=mi_snapshot #小米设备 [ -f "/data/etc/crontabs/root" ] && systype=mi_snapshot #小米设备
[ -w "/var/mnt/cfg/firewall" ] && systype=ng_snapshot #NETGEAR设备 [ -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 [ -z "$CRASHDIR" -a -d /tmp/SC_tmp ] && setdir
#移动文件 #移动文件
mkdir -p ${CRASHDIR} mkdir -p ${CRASHDIR}