From ca8a6b771d8aeb4b41ffe5074208c72ff0ac310e Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 8 Oct 2026 20:33:51 +0000 Subject: [PATCH] =?UTF-8?q?Steer:=20=D0=BE=D1=81=D1=82=D0=B0=D1=82=D0=BA?= =?UTF-8?q?=D0=B8=20=D1=83=D0=B4=D0=B0=D0=BB=D1=91=D0=BD=D0=BD=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=20splify2=20=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=B5=20?= =?UTF-8?q?=D0=BD=D0=B5=20=D0=B1=D0=BB=D0=BE=D0=BA=D0=B8=D1=80=D1=83=D1=8E?= =?UTF-8?q?=D1=82=20=D0=B2=D0=BA=D0=BB=D0=B0=D0=B4=D0=BA=D1=83=20(v2.58)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit splify2 считался установленным по любому следу: каталогу /usr/lib/splify2, скрипту /etc/init.d/splify2 или объекту ubus. После удаления splify2 такие следы остаются, и вкладка Steer закрывалась плашкой «Установлен splify2». Теперь splify2 считается установленным, только если на месте его служба rpcd и пакет luci-app-splify2 (или страница LuCI). И даже тогда вкладка не закрывается, пока правила ядра steer написаны панелью. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01WpV96wH7hUvwFR2a63mWT9 --- ZapretManager_LuCI.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ZapretManager_LuCI.sh b/ZapretManager_LuCI.sh index 05f29aa..27c2b43 100644 --- a/ZapretManager_LuCI.sh +++ b/ZapretManager_LuCI.sh @@ -1,10 +1,10 @@ #!/bin/sh -# Version: 2.57 +# Version: 2.58 set -e GREEN="\033[1;32m"; CYAN="\033[1;36m"; YELLOW="\033[1;33m"; MAGENTA="\033[1;35m"; BLUE="\033[0;34m"; NC="\033[0m"; DGRAY="\033[38;5;244m" -ZM_NEW_VER="2.57" +ZM_NEW_VER="2.58" _zmi_say() { echo -e "${CYAN}==>${NC} $*"; } _zmi_ok() { echo -e " ${GREEN}✓${NC} $*"; } _zmi_step() { echo -e " → $*"; } @@ -83,7 +83,7 @@ cat > '/opt/zapret-manager-luci/backend.sh.zm-new' << 'ZM_INSTALLER_EOF' umask 022 CONF="/etc/config/zapret" -ZM_VERSION="2.57" +ZM_VERSION="2.58" ZM_SCRIPT_URL="https://raw.githubusercontent.com/StressOzz/Zapret-Manager/refs/heads/main/ZapretManager_LuCI.sh" GH_RAW="https://raw.githubusercontent.com" GH_MAIN="https://github.com" @@ -9150,11 +9150,15 @@ _st_migrate _st_sel_remap mkdir -p "$ST_RUN" 2>/dev/null -_st_splify2() { [ -x /usr/libexec/rpcd/splify2 ] || [ -d /usr/lib/splify2 ] || [ -x /etc/init.d/splify2 ] || ubus list splify2 >/dev/null 2>&1; } +_st_splify2_pkg() { grep -qx 'P:luci-app-splify2' /lib/apk/db/installed 2>/dev/null || [ -f /usr/lib/opkg/info/luci-app-splify2.control ]; } +_st_splify2() { + [ -x /usr/libexec/rpcd/splify2 ] || return 1 + _st_splify2_pkg || [ -f /www/luci-static/resources/view/splify2/home.js ] +} _st_blocker() { local b - if _st_splify2; then echo splify2; return; fi + if _st_splify2 && [ "$(stl_spec_whose)" != zm ]; then echo splify2; return; fi if b="$(stl_busy_by)"; then echo "Ядро steer ведёт $b — Zapret Manager его не трогает."; return; fi if _st_spec_foreign; then echo steer; return; fi echo ""