diff --git a/scripts/libs/sb_endpoints.sh b/scripts/libs/sb_endpoints.sh index 820a8500..c3ad77f4 100644 --- a/scripts/libs/sb_endpoints.sh +++ b/scripts/libs/sb_endpoints.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) Juewuy -[ "$ts_service" = ON ] && { +[ "$ts_service" = ON ] && grep -q '"tailscale"' "$CRASHDIR"/jsons/endpoints.json && { [ "$ts_subnet" = true ] && { . "$CRASHDIR"/starts/fw_getlanip.sh && getlanip advertise_routes=$(echo "$host_ipv4"|sed 's/[[:space:]]\+/", "/g; s/^/"/; s/$/"/') @@ -26,7 +26,7 @@ EOF } -[ "$wg_service" = ON ] && { +[ "$wg_service" = ON ] && grep -q '"wireguard"' "$CRASHDIR"/jsons/endpoints.json && { [ -n "$wg_ipv6" ] && wg_ipv6_add=", \"$wg_ipv6\"" cat >"$TMPDIR"/jsons/wireguard.json </dev/null 2>&1 fi -touch "CRASHDIR"/.start_error #标记启动失败,防止自启 +touch "$CRASHDIR"/.start_error #标记启动失败,防止自启 error=$(cat "$TMPDIR"/core_test.log | grep -iEo 'error.*=.*|.*ERROR.*|.*FATAL.*') logger "服务启动失败!请查看报错信息!详细信息请查看$TMPDIR/core_test.log" 33 logger "$error" 31