diff --git a/install.sh b/install.sh index 0cb60a0..cf2e60e 100644 --- a/install.sh +++ b/install.sh @@ -107,7 +107,7 @@ show_config() { local SECRET IP PORT LINK SECRET=$(docker inspect "$CONTAINER_NAME" --format='{{range .Config.Cmd}}{{.}} {{end}}' 2>/dev/null | awk '{print $NF}') IP=$(get_ip) - PORT=$(docker inspect "$CONTAINER_NAME" --format='{{range $p,$c := .HostConfig.PortBindings}}{{(index $c 0).HostPort}}{{end}}' 2>/dev/null) + PORT=$(docker inspect "$CONTAINER_NAME" --format='{{range $p,$c := .HostConfig.PortBindings}}{{(index $c 0).HostPort}} {{end}}' 2>/dev/null | awk '{print $1}') PORT=${PORT:-443} LINK="tg://proxy?server=$IP&port=$PORT&secret=$SECRET" @@ -500,8 +500,8 @@ async def proxy_info(): if not await proxy_running(): return None cmd_str = await docker_val("{{range .Config.Cmd}}{{.}} {{end}}") secret = cmd_str.split()[-1] if cmd_str else "" - hp = await docker_val("{{range $p,$c := .HostConfig.PortBindings}}{{(index $c 0).HostPort}}{{end}}") - port = hp or "443" + hp = await docker_val("{{range $p,$c := .HostConfig.PortBindings}}{{(index $c 0).HostPort}} {{end}}") + port = hp.split()[0] if hp.strip() else "443" ip = await get_ip() link = f"tg://proxy?server={ip}&port={port}&secret={secret}" cfg = load_config()