From 91a3badc67d98aa66e121e43524f696c3e847be6 Mon Sep 17 00:00:00 2001 From: bol-van Date: Tue, 6 Jan 2026 20:35:42 +0300 Subject: [PATCH] AI inspired fixes --- common/dialog.sh | 5 ++--- common/list.sh | 2 +- install_easy.sh | 2 +- ipset/create_ipset.sh | 3 +-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/common/dialog.sh b/common/dialog.sh index addc016..cf6281b 100644 --- a/common/dialog.sh +++ b/common/dialog.sh @@ -37,8 +37,7 @@ ask_list() local M_DEFAULT eval M_DEFAULT="\$$1" local M_ALL=$M_DEFAULT - local M="" - local m + local M="" m M_OLD [ -n "$3" ] && { find_str_in_list "$M_DEFAULT" "$2" || M_DEFAULT="$3" ;} @@ -54,5 +53,5 @@ ask_list() echo selected : $M eval $1="\"$M\"" - [ "$M" != "$M_OLD" ] + [ "$M" != "$M_DEFAULT" ] } diff --git a/common/list.sh b/common/list.sh index 20f0908..1a8250f 100644 --- a/common/list.sh +++ b/common/list.sh @@ -25,7 +25,7 @@ filter_apply_hostlist_target() { # $1 - var name of nfqws params - local v parm parm1 parm2 parm3 parm4 parm5 parm6 parm7 parm8 parm9 parm10 param11 param12 param13 parmNA + local v parm parm1 parm2 parm3 parm4 parm5 parm6 parm7 parm8 parm9 parm10 parm11 parm12 parm13 parmNA eval v="\$$1" if contains "$v" "$HOSTLIST_MARKER" || contains "$v" "$HOSTLIST_NOAUTO_MARKER"; then [ "$MODE_FILTER" = hostlist -o "$MODE_FILTER" = autohostlist ] && diff --git a/install_easy.sh b/install_easy.sh index 54a840d..fe516e6 100755 --- a/install_easy.sh +++ b/install_easy.sh @@ -601,7 +601,7 @@ check_dns() install_systemd() { - INIT_SCRIPT_SRC="$EXEDIR/init.d/sysv/zapret" + INIT_SCRIPT_SRC="$EXEDIR/init.d/sysv/zapret2" CUSTOM_DIR="$ZAPRET_RW/init.d/sysv" check_bins diff --git a/ipset/create_ipset.sh b/ipset/create_ipset.sh index a88137d..323eb24 100755 --- a/ipset/create_ipset.sh +++ b/ipset/create_ipset.sh @@ -68,7 +68,6 @@ ipset_restore() { # $1 - ipset name # $2 - filename - zzexist "$2" || return local fsize=$(zzsize "$2") local svram=0 @@ -77,7 +76,7 @@ ipset_restore() local T="Adding to ipset $1 " [ "$svram" = "1" ] && T="$T (saveram)" - T="$T : $f" + T="$T : $2" echo $T if [ "$svram" = "1" ]; then