From e3db5016a162aa888267549fde3fbf5a9c13aece Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Sun, 20 Dec 2020 17:28:00 +0100 Subject: [PATCH] adblock: fix restrictive sort selection Signed-off-by: Dirk Brenken --- net/adblock/Makefile | 2 +- net/adblock/files/adblock.sh | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/net/adblock/Makefile b/net/adblock/Makefile index fcc5873af6..f25ac57497 100644 --- 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 diff --git a/net/adblock/files/adblock.sh b/net/adblock/files/adblock.sh index 07f16effef..944cf27f01 100755 --- 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 -- 2.30.2