diff --git a/warp.sh b/warp.sh index e46e927..12962b8 100644 --- a/warp.sh +++ b/warp.sh @@ -83,7 +83,7 @@ is_warp_installed() { is_warp_running() { local st - st=$(warp-cli status 2>/dev/null) + st=$(warp-cli --accept-tos status 2>/dev/null) echo "$st" | grep -qi "status.*connected" && ! echo "$st" | grep -qi "disconnected" } @@ -93,7 +93,7 @@ get_warp_status_text() { return fi local status - status=$(warp-cli status 2>/dev/null | head -5) + status=$(warp-cli --accept-tos status 2>/dev/null | head -5) if echo "$status" | grep -qi "disconnected"; then echo "Отключён" elif echo "$status" | grep -qi "connected"; then @@ -163,13 +163,13 @@ install_warp() { echo -e "${GREEN} ✓ Аккаунт зарегистрирован${NC}" echo -e "${YELLOW}[5/6]${NC} Настройка режима SOCKS5-прокси..." - warp-cli mode proxy > /dev/null 2>&1 - warp-cli proxy port "${SOCKS_PORT}" > /dev/null 2>&1 + warp-cli --accept-tos mode proxy > /dev/null 2>&1 + warp-cli --accept-tos proxy port "${SOCKS_PORT}" > /dev/null 2>&1 save_config_val "SOCKS_PORT" "${SOCKS_PORT}" echo -e "${GREEN} ✓ Режим: SOCKS5 на 127.0.0.1:${SOCKS_PORT}${NC}" echo -e "${YELLOW}[6/6]${NC} Подключение..." - warp-cli connect > /dev/null 2>&1 + warp-cli --accept-tos connect > /dev/null 2>&1 sleep 2 if is_warp_running; then @@ -202,7 +202,7 @@ start_warp() { read -p "Нажмите Enter..."; return fi echo -e "\n${YELLOW}Подключение WARP...${NC}" - warp-cli connect > /dev/null 2>&1 + warp-cli --accept-tos connect > /dev/null 2>&1 sleep 2 if is_warp_running; then echo -e "${GREEN}[OK] WARP подключён.${NC}" @@ -223,7 +223,7 @@ stop_warp() { read -p "Нажмите Enter..."; return fi echo -e "\n${YELLOW}Отключение WARP...${NC}" - warp-cli disconnect > /dev/null 2>&1 + warp-cli --accept-tos disconnect > /dev/null 2>&1 echo -e "${GREEN}[OK] WARP отключён.${NC}" log_action "STOP: WARP disconnected" read -p "Нажмите Enter..." @@ -260,13 +260,13 @@ show_status() { echo "" echo -e " ${CYAN}── warp-cli status ──${NC}" - warp-cli status 2>/dev/null | while IFS= read -r line; do + warp-cli --accept-tos status 2>/dev/null | while IFS= read -r line; do echo -e " ${WHITE}$line${NC}" done echo "" echo -e " ${CYAN}── warp-cli settings ──${NC}" - warp-cli settings 2>/dev/null | head -10 | while IFS= read -r line; do + warp-cli --accept-tos settings 2>/dev/null | head -10 | while IFS= read -r line; do echo -e " ${WHITE}$line${NC}" done @@ -345,11 +345,11 @@ rekey_warp() { [[ "$confirm" != "y" ]] && return echo -e "${YELLOW}[1/4] Отключение...${NC}" - warp-cli disconnect > /dev/null 2>&1 + warp-cli --accept-tos disconnect > /dev/null 2>&1 echo -e "${GREEN} ✓${NC}" echo -e "${YELLOW}[2/4] Удаление регистрации...${NC}" - warp-cli registration delete > /dev/null 2>&1 + warp-cli --accept-tos registration delete > /dev/null 2>&1 echo -e "${GREEN} ✓${NC}" echo -e "${YELLOW}[3/4] Новая регистрация...${NC}" @@ -361,9 +361,9 @@ rekey_warp() { echo -e "${GREEN} ✓${NC}" echo -e "${YELLOW}[4/4] Подключение...${NC}" - warp-cli mode proxy > /dev/null 2>&1 - warp-cli proxy port "${SOCKS_PORT}" > /dev/null 2>&1 - warp-cli connect > /dev/null 2>&1 + warp-cli --accept-tos mode proxy > /dev/null 2>&1 + warp-cli --accept-tos proxy port "${SOCKS_PORT}" > /dev/null 2>&1 + warp-cli --accept-tos connect > /dev/null 2>&1 sleep 2 if is_warp_running; then @@ -399,7 +399,7 @@ change_port() { echo -e "${RED}Ошибка: порт должен быть числом от 1024 до 65535.${NC}" done - warp-cli proxy port "$new_port" > /dev/null 2>&1 + warp-cli --accept-tos proxy port "$new_port" > /dev/null 2>&1 save_config_val "SOCKS_PORT" "$new_port" SOCKS_PORT="$new_port" @@ -437,11 +437,11 @@ full_uninstall() { echo -e "${YELLOW}Удаление WARP Manager...${NC}\n" echo -e " ${YELLOW}[1/6]${NC} Отключение WARP..." - warp-cli disconnect > /dev/null 2>&1 + warp-cli --accept-tos disconnect > /dev/null 2>&1 echo -e " ${GREEN}✓${NC} WARP отключён" echo -e " ${YELLOW}[2/6]${NC} Удаление регистрации..." - warp-cli registration delete > /dev/null 2>&1 + warp-cli --accept-tos registration delete > /dev/null 2>&1 echo -e " ${GREEN}✓${NC} Регистрация удалена" echo -e " ${YELLOW}[3/6]${NC} Удаление пакета..."