adblock: fix restrictive sort selection

Signed-off-by: Dirk Brenken <redacted>

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index fcc5873af6762acdba569677fdd1dc997fb2c471..f25ac574970edebd3233e5d1efbc2c7f26024420 100644 (file)
--- a/net/adblock/Makefile
+++ b/net/adblock/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
 PKG_VERSION:=4.0.8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 

diff --git a/net/adblock/files/adblock.sh b/net/adblock/files/adblock.sh
index 07f16effefc9d240c45bf1d01ff4a842c745b382..944cf27f0164cbe72cd3da8fb7bee9c6b9128d27 100755 (executable)
--- a/net/adblock/files/adblock.sh
+++ b/net/adblock/files/adblock.sh
@@ -1653,7 +1653,11 @@ fi
 adb_sort="$(command -v gnu-sort)"
 if [ -z "${adb_sort}" ]
 then
-       f_log "err" "gnu-sort not found"
+       adb_sort="$(command -v sort)"
+       if [ -z "$("${adb_sort}" --help 2>/dev/null | grep -Fo -m1 "coreutils")" ]
+       then
+               f_log "err" "coreutils sort not found"
+       fi
 fi
 
 # version information