ForkMaster/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2024-09-22 09:42:51 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

move fsleep to common

Browse Source
This commit is contained in:
bol-van 2023-10-31 14:19:41 +03:00
parent c9f34a064e
commit 81b60aa4ed
3 changed files with 35 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
blockcheck.sh
View File

@ -58,40 +58,6 @@ exitp()
exit $1
}
fsleep_setup()
{
[ -n "$FSLEEP" ] || {
if sleep 0.1 2>/dev/null; then
FSLEEP=1
elif busybox usleep 1 2>/dev/null; then
FSLEEP=2
else
local errtext=$(read -t 0.001 2>&1)
if [ -z "$errtext" ]; then
FSLEEP=3
else
FSLEEP=0
fi
fi
}
}
minsleep()
{
case "$FSLEEP" in
1)
sleep 0.1
;;
2)
busybox usleep 100000
;;
3)
read -t 0.1
;;
*)
sleep 1
esac
}
IPT()
{
$IPTABLES -C "$@" >/dev/null 2>/dev/null || $IPTABLES -I "$@"

34
common/base.sh
View File

@ -196,3 +196,37 @@ fix_sbin_path()
printf "%s\n" $PATH | grep -Fxq '/sbin' || PATH="/sbin:$PATH"
export PATH
}
fsleep_setup()
{
[ -n "$FSLEEP" ] || {
if sleep 0.1 2>/dev/null; then
FSLEEP=1
elif busybox usleep 1 2>/dev/null; then
FSLEEP=2
else
local errtext=$(read -t 0.001 2>&1)
if [ -z "$errtext" ]; then
FSLEEP=3
else
FSLEEP=0
fi
fi
}
}
minsleep()
{
case "$FSLEEP" in
1)
sleep 0.1
;;
2)
busybox usleep 100000
;;
3)
read -t 0.1
;;
*)
sleep 1
esac
}

20
install_easy.sh
View File

@ -27,24 +27,6 @@ GET_LIST="$IPSET_DIR/get_config.sh"
MD5=md5sum
exists $MD5 || MD5=md5
fsleep_setup()
{
[ -n "$FSLEEP" ] || {
if sleep 0.1 2>/dev/null; then
FSLEEP=1
elif busybox usleep 1 2>/dev/null; then
FSLEEP=2
else
local errtext=$(read -t 0.001 2>&1)
if [ -z "$errtext" ]; then
FSLEEP=3
else
FSLEEP=0
fi
fi
}
}
sedi()
{
# MacOS doesnt support -i without parameter. busybox doesnt support -i with parameter.
@ -852,7 +834,7 @@ check_prerequisites_openwrt()
[ "$FSLEEP" = 0 ] && is_linked_to_busybox sleep && {
echo
echo no methods of sub-second sleep were found.
echo if you want to speed up blockcheck install coreutils-sleep
echo if you want to speed up blockcheck install coreutils-sleep. it requires about 40 Kb space
if ask_yes_no N "do you want to install COREUTILS sleep"; then
[ "$UPD" = "0" ] && {
opkg update