kobalt/go_warp_pro
1
0
Fork 0
mirror of https://github.com/anten-ka/go_warp_pro.git synced 2026-05-19 16:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix container selector formatting: strip CR, simplify layout, no ANSI in brackets

Browse Source 
Made-with: Cursor
This commit is contained in:
anten-ka
2026-03-22 13:51:53 +03:00
parent 195345d6f4
commit 7c7364f501
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
warp.sh
View File

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