From 67f8c6e52aae3923171c7faf5bba8db6a4f8d35e Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Tue, 31 Oct 2017 22:00:34 +0100 Subject: bin/common-functions: find depends (more) correctly in split packages --- bin/common-functions | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'bin/common-functions') diff --git a/bin/common-functions b/bin/common-functions index 1330bd1..fe77a06 100755 --- a/bin/common-functions +++ b/bin/common-functions @@ -195,8 +195,12 @@ generate_package_metadata() { { { printf 'all_depend = %s\n' 'base' 'base-devel' - sed -n "$(printf '/^pkgname = /q;/^\tdepends = /p')" "${file_prefix}.SRCINFO" - grep "$(printf '^\t\\(makedepends\\|checkdepends\\) = ')" "${file_prefix}.SRCINFO" + sed -n "$( + printf '/^\t%s = /p' \ + 'depends' \ + 'makedepends' \ + 'checkdepends' + )" "${file_prefix}.SRCINFO" } | \ cut -d= -f2 | \ sed 's|^\s\+||; s|[<>]$||' | \ @@ -211,7 +215,7 @@ generate_package_metadata() { { { printf 'all_depend = %s\n' 'base' - sed -n "$(printf '/^pkgname = /q;/^\tdepends = /p')" "${file_prefix}.SRCINFO" + sed -n "$(printf '/^\tdepends = /p')" "${file_prefix}.SRCINFO" } | \ cut -d= -f2 | \ sed 's|^\s\+||; s|[<>]$||' | \ -- cgit v1.2.3-54-g00ecf