diff --git a/ShellCrash.tar.gz b/ShellCrash.tar.gz index 8ffc5e7e..ddfc7b3b 100644 Binary files a/ShellCrash.tar.gz and b/ShellCrash.tar.gz differ diff --git a/bin/version b/bin/version index 06dd04fb..76d2829a 100644 --- a/bin/version +++ b/bin/version @@ -1,4 +1,4 @@ meta_v=v1.19.17 singboxr_v=1.13.0-alpha.27 -versionsh=1.9.5alpha1 +versionsh=1.9.5alpha1.2 GeoIP_v=20251205 diff --git a/scripts/menus/6_core_config.sh b/scripts/menus/6_core_config.sh index 35601c41..b6ddacb1 100644 --- a/scripts/menus/6_core_config.sh +++ b/scripts/menus/6_core_config.sh @@ -448,7 +448,7 @@ EOF done < "$CRASHDIR"/configs/providers.cfg 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 rm -rf "$TMPDIR"/providers #调用内核测试 @@ -551,7 +551,7 @@ EOF sed -i '$s/},/}]}/' "$TMPDIR"/providers/outbounds_add.json sed -i '$s/},/}]}/' "$TMPDIR"/providers/providers.json #使用模版生成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 #调用内核测试 . "$CRASHDIR"/starts/check_core.sh && check_core && "$TMPDIR"/CrashCore merge "$TMPDIR"/config.json -C "$TMPDIR"/providers diff --git a/scripts/menus/fw_filter.sh b/scripts/menus/fw_filter.sh index 1b5877ed..40b57bcb 100644 --- a/scripts/menus/fw_filter.sh +++ b/scripts/menus/fw_filter.sh @@ -16,7 +16,7 @@ set_fw_filter() { echo -e " 1 过滤非常用端口: \033[36m$common_ports\033[0m ————用于过滤P2P流量" echo -e " 2 过滤局域网设备: \033[36m$mac_return\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 " 6 自定义保留地址ipv4网段: 需要以保留地址为访问目标的环境" echo "-----------------------------------------------" diff --git a/scripts/menus/running_status.sh b/scripts/menus/running_status.sh index 1e0245a9..e62c8acc 100644 --- a/scripts/menus/running_status.sh +++ b/scripts/menus/running_status.sh @@ -7,7 +7,7 @@ running_status(){ if [ -n "$start_time" ]; then time=$(($(date +%s) - start_time)) day=$((time / 86400)) - [ "$day" = "0" ] && day='' || day="$day天" - time=$(date -u -d @${time} +%H小时%M分%S秒) + [ "$day" = "0" ] && day='' || day="$dayD" + time=$(date -u -d @${time} +%H:%M:%S) fi } diff --git a/scripts/starts/singbox_modify.sh b/scripts/starts/singbox_modify.sh index edec27cf..1a04c444 100644 --- a/scripts/starts/singbox_modify.sh +++ b/scripts/starts/singbox_modify.sh @@ -200,7 +200,7 @@ EOF EOF #生成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" },' cat >"$TMPDIR"/jsons/add_route.json <