apk-related bugfixes

Author: stangri

Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock-fast
 PKG_VERSION:=1.2.1
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
 PKG_LICENSE:=AGPL-3.0-or-later
 

files/etc/init.d/adblock-fast

@@ -433,8 +433,8 @@ is_fw4_restart_needed() {
 	fi
 }
 is_integer() { case "$1" in ''|*[!0-9]*) return 1;; esac; [ "$1" -ge 1 ] && [ "$1" -le 65535 ] || return 1; return 0; }
-is_greater() { test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"; }
-is_greater_or_equal() { test "$(printf '%s\n' "$@" | sort -V | head -n 1)" = "$2"; }
+is_greater() { test "$(printf '%s\n' "$@" | sort -V 2>/dev/null | head -n 1)" != "$1"; }
+is_greater_or_equal() { test "$(printf '%s\n' "$@" | sort -V 2>/dev/null | head -n 1)" = "$2"; }
 # shellcheck disable=SC3057
 is_https_url() { [ "${1:0:8}" = "https://" ]; }
 is_newline_ending() { [ "$(tail -c1 "$1" | wc -l)" -ne '0' ]; }
@@ -787,7 +787,7 @@ detect_file_type() {
 		echo 'dnsmasq3'
 	elif grep -q -e '^0\.0\.0\.0\s' -e '^127\.0\.0\.1\s' "$file"; then
 		echo 'hosts'
-	elif [ -n "$(sed "$domainsFilter" "$file" | head -1)" ]; then
+	elif [ -n "$(sed "$domainsFilter" "$file" 2>/dev/null | head -1)" ]; then
 		echo 'domains'
 	fi
 }

files/etc/uci-defaults/90-adblock-fast

@@ -126,7 +126,7 @@ if [ -s '/etc/config/simple-adblock' ] \
 fi
 
 # Transition to list names
-_find_name() { grep -B1 "$1" "/etc/config/${packageName}-opkg" | head -1 | cut -d "'" -f2; }
+_find_name() { grep -B1 "$1" "/etc/config/${packageName}-opkg" 2>/dev/null | head -1 | cut -d "'" -f2; }
 
 add_name() {
 	local cfg="$1"