mirror of
https://github.com/bol-van/zapret.git
synced 2024-11-26 20:20:53 +03:00
Compare commits
No commits in common. "db0caf7d5805b66f1e1d7170f31ce1146016bb37" and "6481f2204eeebbdf7dd8df5974f3db458fb49ec7" have entirely different histories.
db0caf7d58
...
6481f2204e
@ -682,20 +682,6 @@ check_prerequisites_linux()
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
removable_pkgs_openwrt()
|
|
||||||
{
|
|
||||||
PKGS="iptables-mod-extra iptables-mod-nfqueue iptables-mod-filter iptables-mod-ipopt iptables-mod-conntrack-extra ip6tables-mod-nat ip6tables-extra kmod-nft-queue gzip coreutils-sort coreutils-sleep curl"
|
|
||||||
}
|
|
||||||
|
|
||||||
remove_extra_pkgs_openwrt()
|
|
||||||
{
|
|
||||||
local PKGS
|
|
||||||
echo \* remove dependencies
|
|
||||||
removable_pkgs_openwrt
|
|
||||||
echo these packages may have been installed by install_easy.sh : $PKGS
|
|
||||||
ask_yes_no N "do you want to remove them" && opkg remove --autoremove $PKGS
|
|
||||||
}
|
|
||||||
|
|
||||||
check_prerequisites_openwrt()
|
check_prerequisites_openwrt()
|
||||||
{
|
{
|
||||||
echo \* checking prerequisites
|
echo \* checking prerequisites
|
||||||
|
@ -359,7 +359,3 @@ blockcheck: do not require root if SKIP_PKTWS=1
|
|||||||
v68:
|
v68:
|
||||||
|
|
||||||
readme.md : move russian version to markdown
|
readme.md : move russian version to markdown
|
||||||
nfqws,tpws: use alternate $ sign for $<config_file>
|
|
||||||
repo: binaries removed from repo. git actions binaries build in releases.
|
|
||||||
uninstall_easy.sh: offer to remove dependencies in openwrt
|
|
||||||
install_easy.sh: allow to download lists in autohostlist filter mode
|
|
||||||
|
@ -206,12 +206,12 @@ select_mode()
|
|||||||
|
|
||||||
select_getlist()
|
select_getlist()
|
||||||
{
|
{
|
||||||
if [ "$MODE_FILTER" = "ipset" -o "$MODE_FILTER" = "hostlist" -o "$MODE_FILTER" = "autohostlist" ]; then
|
if [ "$MODE_FILTER" = "ipset" -o "$MODE_FILTER" = "hostlist" ]; then
|
||||||
local D=N
|
local D=N
|
||||||
[ -n "$GETLIST" ] && D=Y
|
[ -n "$GETLIST" ] && D=Y
|
||||||
echo
|
echo
|
||||||
if ask_yes_no $D "do you want to auto download ip/host list"; then
|
if ask_yes_no $D "do you want to auto download ip/host list"; then
|
||||||
if [ "$MODE_FILTER" = "hostlist" -o "$MODE_FILTER" = "autohostlist" ] ; then
|
if [ "$MODE_FILTER" = "hostlist" ] ; then
|
||||||
GETLISTS="get_refilter_domains.sh get_antizapret_domains.sh get_reestr_resolvable_domains.sh get_reestr_hostlist.sh"
|
GETLISTS="get_refilter_domains.sh get_antizapret_domains.sh get_reestr_resolvable_domains.sh get_reestr_hostlist.sh"
|
||||||
GETLIST_DEF="get_antizapret_domains.sh"
|
GETLIST_DEF="get_antizapret_domains.sh"
|
||||||
else
|
else
|
||||||
|
@ -72,9 +72,6 @@ remove_openwrt()
|
|||||||
nft_del_table
|
nft_del_table
|
||||||
restart_openwrt_firewall
|
restart_openwrt_firewall
|
||||||
crontab_del
|
crontab_del
|
||||||
remove_extra_pkgs_openwrt
|
|
||||||
echo
|
|
||||||
echo to fully remove zapret : rm -r \"$ZAPRET_BASE\"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
remove_macos()
|
remove_macos()
|
||||||
|
Loading…
Reference in New Issue
Block a user