From 7c7364f5015ae62a71e7f47d673c7558c47f13c9 Mon Sep 17 00:00:00 2001
From: anten-ka <antenkamax@gmail.com>
Date: Sun, 22 Mar 2026 13:51:53 +0300
Subject: [PATCH] Fix container selector formatting: strip CR, simplify layout,
 no ANSI in brackets

Made-with: Cursor
---
 warp.sh | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/warp.sh b/warp.sh
index f48def9..19f1915 100644
--- a/warp.sh
+++ b/warp.sh
@@ -557,20 +557,21 @@ awg_select_container() {
         awg_load_container_data
         return 0
     fi
-    echo -e "\n${CYAN}Выберите контейнер:${NC}"
+    echo -e "\n${CYAN}Выберите контейнер:${NC}\n"
     local i=1
     for c in "${AWG_ALL_CONTAINERS[@]}"; do
-        local has_warp="${DIM}нет${NC}"
-        docker exec "$c" sh -c "[ -f '/opt/warp/warp.conf' ]" 2>/dev/null && has_warp="${GREEN}да${NC}"
-        local clients="-"
-        local cnt; cnt=$(docker exec "$c" sh -c "cat /opt/warp/clients.list 2>/dev/null | grep -c '.' || echo 0" 2>/dev/null | tr -d '\r')
-        [ "$cnt" != "0" ] && clients="$cnt"
-        local marker=""
-        [ "$c" = "${CONTAINER:-}" ] && marker=" ${CYAN}*${NC}"
-        echo -e "  ${GREEN}$i)${NC} $c  [WARP: $has_warp | Клиентов: $clients]${marker}"
+        local warp_status="нет"
+        docker exec "$c" sh -c "[ -f '/opt/warp/warp.conf' ]" 2>/dev/null && warp_status="да"
+        local clients="0"
+        clients=$(docker exec "$c" sh -c "cat /opt/warp/clients.list 2>/dev/null | grep -c '.' || echo 0" 2>/dev/null | tr -d '\r\n')
+        local mark=""
+        [ "$c" = "${CONTAINER:-}" ] && mark=" *"
+        echo -e "  ${GREEN}$i)${NC} $c  (WARP: $warp_status, клиентов: $clients)${mark}"
         ((i++))
     done
+    echo -e "\n  ${DIM}* = текущий${NC}"
     echo -e "  ${DIM}0) Отмена${NC}"
+    echo ""
     while true; do
         read -p "  > " ch
         [ "$ch" = "0" ] && return 1