From 06f8ae1a6b17414e00f51e3db495daa1b66a9c15 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Mon, 18 Mar 2019 16:30:48 -0400
Subject: ob_substvars(): Substitute binary package vars

---
(limited to 'src')

diff --git a/src/ob-checkbuilddeps.sh b/src/ob-checkbuilddeps.sh
index 39d7e60..f75cf43 100644
--- a/src/ob-checkbuilddeps.sh
+++ b/src/ob-checkbuilddeps.sh
@@ -60,7 +60,7 @@ check_build_deps()
 	deps="$(ob_get_source_parameter 'Build-Depends')"
 	deps="$(ob_reduce_deps -a "${OPK_HOST_ARCH}" \
 		-p "${OPK_HOST_PLAT}" -- "${deps}")"
-	deps="$(ob_substvars "${deps}")"
+	deps="$(ob_substvars "${deps}" '')"
 
 	missing=''
 	IFS=','
diff --git a/src/ob-genchanges.sh b/src/ob-genchanges.sh
index f972002..9e8c75a 100644
--- a/src/ob-genchanges.sh
+++ b/src/ob-genchanges.sh
@@ -48,7 +48,7 @@ write_changes()
 		ob_set_package_substvars "${pkg}"
 		desc="$(ob_get_binary_parameter "${pkg}" 'Description' | \
 			head -n 1)"
-		desc="$(ob_substvars "${desc}")"
+		desc="$(ob_substvars "${desc}" "${pkg}")"
 		printf ' %s - %s\n' "${pkg}" "${desc}" >&3
 	done
 
diff --git a/src/ob-gencontrol.sh b/src/ob-gencontrol.sh
index e42ab60..c2eb61b 100644
--- a/src/ob-gencontrol.sh
+++ b/src/ob-gencontrol.sh
@@ -95,14 +95,16 @@ gen_control()
 						-a "${OPK_HOST_ARCH}" \
 						-p "${OPK_HOST_PLAT}" \
 						-- "${value}")"
-					value="$(ob_substvars "${value}")"
+					value="$(ob_substvars "${value}" \
+						"${binary}")"
 					;;
 				'Conflicts' | 'Provides' | 'Replaces')
 					value="$(ob_reduce_deps \
 						-a "${OPK_HOST_ARCH}" \
 						-p "${OPK_HOST_PLAT}" \
 						-u -- "${value}")"
-					value="$(ob_substvars "${value}")"
+					value="$(ob_substvars "${value}" \
+						"${binary}")"
 					;;
 			esac
 			printf '%s: %s\n' "${name}" "${value}" | \
@@ -222,7 +224,7 @@ main()
 			plat="$(ob_get_binary_parameter "${pkg}" 'Platform')"
 			[ x"${plat}" != x'all' ] && plat="${OPK_HOST_PLAT}"
 			desc="$(ob_get_binary_parameter "${pkg}" 'Description')"
-			desc="$(ob_substvars "${desc}")"
+			desc="$(ob_substvars "${desc}" "${pkg}")"
 			gen_control "${pkg}" "${OPK_BINARY_VERSION}" \
 				"${arch}" "${plat}" "${desc}" 'true'
 			install_maintainer_scripts "${pkg}"
--
cgit v0.9.1