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

Merge branch 'juewuy:dev' into patch-1

Browse Source
This commit is contained in:
Sofia
2026-01-19 00:43:15 +08:00
committed by GitHub
parent 1dd48baca2 e25be4fafc
commit 77687d4581
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
ShellCrash.tar.gz
View File

Binary file not shown.

2
bin/version
View File

@@ -1,4 +1,4 @@
meta_v=v1.19.17 meta_v=v1.19.17
singboxr_v=1.13.0-alpha.27 singboxr_v=1.13.0-alpha.27
versionsh=1.9.5alpha1 versionsh=1.9.5alpha1.2
GeoIP_v=20251205 GeoIP_v=20251205

4
scripts/menus/6_core_config.sh
View File

@@ -448,7 +448,7 @@ EOF
done < "$CRASHDIR"/configs/providers.cfg done < "$CRASHDIR"/configs/providers.cfg
fi fi
#修饰模版文件并合并 #修饰模版文件并合并
sed -i "s/\{providers_tags\}\|providers_tags/$providers_tags/g" "$TMPDIR"/providers/proxy-groups.yaml sed -i "s/{providers_tags}/$providers_tags/g" "$TMPDIR"/providers/proxy-groups.yaml
cut -c 1- "$TMPDIR"/providers/providers.yaml "$TMPDIR"/providers/proxy-groups.yaml "$TMPDIR"/providers/rules.yaml > "$TMPDIR"/config.yaml cut -c 1- "$TMPDIR"/providers/providers.yaml "$TMPDIR"/providers/proxy-groups.yaml "$TMPDIR"/providers/rules.yaml > "$TMPDIR"/config.yaml
rm -rf "$TMPDIR"/providers rm -rf "$TMPDIR"/providers
#调用内核测试 #调用内核测试
@@ -551,7 +551,7 @@ EOF
sed -i '$s/},/}]}/' "$TMPDIR"/providers/outbounds_add.json sed -i '$s/},/}]}/' "$TMPDIR"/providers/outbounds_add.json
sed -i '$s/},/}]}/' "$TMPDIR"/providers/providers.json sed -i '$s/},/}]}/' "$TMPDIR"/providers/providers.json
#使用模版生成outbounds和rules模块 #使用模版生成outbounds和rules模块
cat "$TMPDIR"/provider_temp_file | sed "s/\{providers_tags\}\|\"providers_tags\"/$providers_tags/g" > "$TMPDIR"/providers/outbounds.json cat "$TMPDIR"/provider_temp_file | sed "s/{providers_tags}/$providers_tags/g" | sed "s/\"providers_tags\"/$providers_tags/g" > "$TMPDIR"/providers/outbounds.json
rm -rf "$TMPDIR"/provider_temp_file rm -rf "$TMPDIR"/provider_temp_file
#调用内核测试 #调用内核测试
. "$CRASHDIR"/starts/check_core.sh && check_core && "$TMPDIR"/CrashCore merge "$TMPDIR"/config.json -C "$TMPDIR"/providers . "$CRASHDIR"/starts/check_core.sh && check_core && "$TMPDIR"/CrashCore merge "$TMPDIR"/config.json -C "$TMPDIR"/providers

2
scripts/menus/fw_filter.sh
View File

@@ -16,7 +16,7 @@ set_fw_filter() {
echo -e " 1 过滤非常用端口： \033[36m$common_ports\033[0m ————用于过滤P2P流量" echo -e " 1 过滤非常用端口： \033[36m$common_ports\033[0m ————用于过滤P2P流量"
echo -e " 2 过滤局域网设备： \033[36m$mac_return\033[0m ————使用黑/白名单进行过滤" echo -e " 2 过滤局域网设备： \033[36m$mac_return\033[0m ————使用黑/白名单进行过滤"
echo -e " 3 过滤QUIC协议: \033[36m$quic_rj\033[0m ————优化视频性能" echo -e " 3 过滤QUIC协议: \033[36m$quic_rj\033[0m ————优化视频性能"
echo -e " 4 过滤CN_IP(6)列表: \033[36m$cn_ip_route\033[0m ————优化性能，不兼容Fake-ip" echo -e " 4 过滤CN_IP(4/6)列表: \033[36m$cn_ip_route\033[0m ————优化性能"
echo -e " 5 自定义透明路由ipv4网段: 适合vlan等复杂网络环境" echo -e " 5 自定义透明路由ipv4网段: 适合vlan等复杂网络环境"
echo -e " 6 自定义保留地址ipv4网段: 需要以保留地址为访问目标的环境" echo -e " 6 自定义保留地址ipv4网段: 需要以保留地址为访问目标的环境"
echo "-----------------------------------------------" echo "-----------------------------------------------"

4
scripts/menus/running_status.sh
View File

@@ -7,7 +7,7 @@ running_status(){
if [ -n "$start_time" ]; then if [ -n "$start_time" ]; then
time=$(($(date +%s) - start_time)) time=$(($(date +%s) - start_time))
day=$((time / 86400)) day=$((time / 86400))
[ "$day" = "0" ] && day='' || day="$day天" [ "$day" = "0" ] && day='' || day="$dayD"
time=$(date -u -d @${time} +%H小时%M分%S秒) time=$(date -u -d @${time} +%H:%M:%S)
fi fi
} }

6
scripts/starts/singbox_modify.sh
View File

@@ -200,7 +200,7 @@ EOF
EOF EOF
#生成add_route.json #生成add_route.json
#域名嗅探配置 #域名嗅探配置
[ "$sniffer" = ON ] && ! grep -Eq '"action" *:[[:space:]]*"sniff"' "$CRASHDIR"/jsons/*.json && sniffer_set='{ "action": "sniff", "timeout": "500ms" },' [ "$sniffer" = ON ] && sniffer_set='{ "action": "sniff", "timeout": "500ms" },'
[ "$ts_service" = ON ] && tailscale_set='{ "inbound": [ "ts-ep" ], "port": 53, "action": "hijack-dns" },' [ "$ts_service" = ON ] && tailscale_set='{ "inbound": [ "ts-ep" ], "port": 53, "action": "hijack-dns" },'
cat >"$TMPDIR"/jsons/add_route.json <<EOF cat >"$TMPDIR"/jsons/add_route.json <<EOF
{ {
@@ -211,8 +211,8 @@ EOF
{ "inbound": [ "dns-in" ], "action": "hijack-dns" }, { "inbound": [ "dns-in" ], "action": "hijack-dns" },
$tailscale_set $tailscale_set
$sniffer_set $sniffer_set
{ "clash_mode": [ "Direct" ] , "outbound": "DIRECT" }, { "clash_mode": "Direct" , "outbound": "DIRECT" },
{ "clash_mode": [ "Global" ], "outbound": "GLOBAL" } { "clash_mode": "Global" , "outbound": "GLOBAL" }
] ]
} }
} }

2
version
View File

@@ -1 +1 @@
1.9.5alpha1 1.9.5alpha1.2