Merge branch 'master' into dev

# Conflicts:
#	scripts/libs/sb_endpoints.sh
This commit is contained in:
juewuy
2026-01-15 19:04:13 +08:00
5 changed files with 4 additions and 4 deletions

Binary file not shown.

Binary file not shown.

View File

@@ -1,4 +1,4 @@
meta_v=v1.19.17
singboxr_v=1.13.0-alpha.27
versionsh=1.9.4beta3
versionsh=1.9.4beta3.1
GeoIP_v=20251205

View File

@@ -1,7 +1,7 @@
#!/bin/sh
# Copyright (C) Juewuy
[ "$ts_service" = ON ] && grep -q '"tailscale"' "$CRASHDIR"/jsons/endpoints.json 2>/dev/null && {
[ "$ts_service" = ON ] && ! grep -q '"tailscale"' "$CRASHDIR"/jsons/endpoints.json 2>/dev/null && {
[ "$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 ] && grep -q '"wireguard"' "$CRASHDIR"/jsons/endpoints.json 2>/dev/null && {
[ "$wg_service" = ON ] && ! grep -q '"wireguard"' "$CRASHDIR"/jsons/endpoints.json 2>/dev/null && {
[ -n "$wg_ipv6" ] && wg_ipv6_add=", \"$wg_ipv6\""
cat >"$TMPDIR"/jsons/wireguard.json <<EOF
{

View File

@@ -1 +1 @@
1.9.4beta3
1.9.4beta3.1