diff options
| author | Dirk Brenken <dev@brenken.org> | 2020-12-20 17:28:00 +0100 |
|---|---|---|
| committer | Dirk Brenken <dev@brenken.org> | 2020-12-20 17:28:00 +0100 |
| commit | e3db5016a162aa888267549fde3fbf5a9c13aece (patch) | |
| tree | cb77f213719c4ec7377cc848a4e1aec6edd130e7 /net/adblock | |
| parent | a9076b0327b46cde448d861ae0235d23237cdf34 (diff) | |
adblock: fix restrictive sort selection
Signed-off-by: Dirk Brenken <dev@brenken.org>
Diffstat (limited to 'net/adblock')
| -rw-r--r-- | net/adblock/Makefile | 2 | ||||
| -rwxr-xr-x | net/adblock/files/adblock.sh | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/net/adblock/Makefile b/net/adblock/Makefile index fcc5873af..f25ac5749 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 <dev@brenken.org> diff --git a/net/adblock/files/adblock.sh b/net/adblock/files/adblock.sh index 07f16effe..944cf27f0 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 |