gandc/zapret2
Template
1
0
Fork 0
mirror of https://github.com/bol-van/zapret2.git synced 2026-03-14 06:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

AI inspired fixes

Browse Source
This commit is contained in:
bol-van
2026-01-06 20:35:42 +03:00
parent ff15bcceae
commit 91a3badc67
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/dialog.sh
View File

@@ -37,8 +37,7 @@ ask_list()
local M_DEFAULT local M_DEFAULT
eval M_DEFAULT="\$$1" eval M_DEFAULT="\$$1"
local M_ALL=$M_DEFAULT local M_ALL=$M_DEFAULT
local M="" local M="" m M_OLD
local m
[ -n "$3" ] && { find_str_in_list "$M_DEFAULT" "$2" || M_DEFAULT="$3" ;} [ -n "$3" ] && { find_str_in_list "$M_DEFAULT" "$2" || M_DEFAULT="$3" ;}
@@ -54,5 +53,5 @@ ask_list()
echo selected : $M echo selected : $M
eval $1="\"$M\"" eval $1="\"$M\""
[ "$M" != "$M_OLD" ] [ "$M" != "$M_DEFAULT" ]
} }

2
common/list.sh
View File

@@ -25,7 +25,7 @@ filter_apply_hostlist_target()
{ {
# $1 - var name of nfqws params # $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" eval v="\$$1"
if contains "$v" "$HOSTLIST_MARKER" || contains "$v" "$HOSTLIST_NOAUTO_MARKER"; then if contains "$v" "$HOSTLIST_MARKER" || contains "$v" "$HOSTLIST_NOAUTO_MARKER"; then
[ "$MODE_FILTER" = hostlist -o "$MODE_FILTER" = autohostlist ] && [ "$MODE_FILTER" = hostlist -o "$MODE_FILTER" = autohostlist ] &&

2
install_easy.sh
View File

@@ -601,7 +601,7 @@ check_dns()
install_systemd() 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" CUSTOM_DIR="$ZAPRET_RW/init.d/sysv"
check_bins check_bins

3
ipset/create_ipset.sh
View File

@@ -68,7 +68,6 @@ ipset_restore()
{ {
# $1 - ipset name # $1 - ipset name
# $2 - filename # $2 - filename
zzexist "$2" || return zzexist "$2" || return
local fsize=$(zzsize "$2") local fsize=$(zzsize "$2")
local svram=0 local svram=0
@@ -77,7 +76,7 @@ ipset_restore()
local T="Adding to ipset $1 " local T="Adding to ipset $1 "
[ "$svram" = "1" ] && T="$T (saveram)" [ "$svram" = "1" ] && T="$T (saveram)"
T="$T : $f" T="$T : $2"
echo $T echo $T
if [ "$svram" = "1" ]; then if [ "$svram" = "1" ]; then