about summary refs log tree commit diff
diff options
context:
space:
mode:
authormaxice8 <thinkabit.ukim@gmail.com>2018-03-17 18:35:37 -0300
committerLeah Neukirchen <leah@vuxu.org>2018-03-17 23:35:56 +0100
commitfda52d493b3f6f077cae318e489dbf10bbaaa478 (patch)
tree86d50f83bf7b775462ad268d680a3deafc398150
parent16778479197088881936b2604ac4d60aa3987c46 (diff)
downloadxtools-fda52d493b3f6f077cae318e489dbf10bbaaa478.tar.gz
xtools-fda52d493b3f6f077cae318e489dbf10bbaaa478.tar.xz
xtools-fda52d493b3f6f077cae318e489dbf10bbaaa478.zip
xpcdeps: ignore $ { }
Closes: #84 [via git-merge-pr]
-rwxr-xr-xxpcdeps5
1 files changed, 3 insertions, 2 deletions
diff --git a/xpcdeps b/xpcdeps
index bb4ac44..ea9bac2 100755
--- a/xpcdeps
+++ b/xpcdeps
@@ -17,8 +17,9 @@ create_pcfile() {
 		for rpkg in $( xbps-query --repository=hostdir/binpkgs/"$branch" --cat="$file" "$pkgname" | grep Requires: | cut -d: -f2 | sed 's/,/ /g' ) ; do
 			# This makes the iterator ignore over the version specifier available for pkg-config
 			# >=, <=, >, <, =, and also ignore versions by ignoring everything that doesn't have
-			# a letter
-			[ -z "${rpkg##*[<=>]*}" ] && continue
+			# a letter, we also ignore $ { } because some package like mutter define a requires=
+			# variable and then makes the actual Requires: be ${requires}
+			[ -z "${rpkg##*[\{<=>\}\$]*}" ] && continue
 			[ -z "${rpkg##*[a-zA-Z]*}" ] || continue
 			printf "%s\\n" "$rpkg" >> "$tempdir/$1.pc"
 		done