From 23df39d38dc94226e83aee66de3cd8d4f7944fb2 Mon Sep 17 00:00:00 2001
From: Petro1990 <petrolobanok@gmail.com>
Date: Fri, 13 Mar 2026 22:32:46 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=86=D0=B8=D0=BA=D0=BB=D0=B8=D1=87=D0=B5?=
 =?UTF-8?q?=D1=81=D0=BA=D0=B0=D1=8F=20=D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BA=D0=B0=20=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B8=D0=BC?=
 =?UTF-8?q?=D0=BE=D1=81=D1=82=D0=B5=D0=B9=20(v1.5.5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rproxy | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/rproxy b/rproxy
index 564c042..fea79c4 100644
--- a/rproxy
+++ b/rproxy
@@ -3,7 +3,7 @@
 # Публикация локальных сервисов через SSH-туннели + nginx на VPS
 # http://5.104.75.50:3000/Petro1990/rProxy
 
-VERSION="1.5.4"
+VERSION="1.5.5"
 export PATH="/opt/bin:/opt/sbin:$PATH"
 CONF_DIR="/opt/etc/rproxy"
 CONF_FILE="$CONF_DIR/rproxy.conf"
@@ -136,21 +136,23 @@ EOF
 ensure_local_deps() {
     local missing=""
     
+    # Внутренняя функция для надежной проверки
+    _has_cmd() {
+        command -v "$1" >/dev/null 2>&1 || [ -x "/opt/bin/$1" ] || [ -x "/opt/sbin/$1" ]
+    }
+
     # Проверка openssl
-    if ! command -v openssl >/dev/null 2>&1; then
+    if ! _has_cmd openssl; then
         missing="$missing openssl-util"
     fi
     
     # Проверка sshpass
-    if ! command -v sshpass >/dev/null 2>&1; then
-        # Дополнительная проверка через opkg на случай если бинарник не в PATH
-        if ! opkg list-installed sshpass | grep -q sshpass; then
-            missing="$missing sshpass"
-        fi
+    if ! _has_cmd sshpass; then
+        missing="$missing sshpass"
     fi
     
-    # Проверка curl (нужен для обновлений)
-    if ! command -v curl >/dev/null 2>&1; then
+    # Проверка curl
+    if ! _has_cmd curl; then
         missing="$missing curl"
     fi
     
@@ -162,7 +164,6 @@ ensure_local_deps() {
             msg "Установка $pkg..."
             opkg install "$pkg" >/dev/null 2>&1
         done
-        # Даем время системе обновить кеш путей
         hash -r 2>/dev/null
         msg "Все зависимости установлены."
     fi