From 719a4eb167b15e0d4c81302e539f0cb847d444b8 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Sat, 22 Dec 2018 23:50:13 -0500
Subject: opkbuild, ob-*: Use variables set by shpp

---
(limited to 'src/ob-checkbuilddeps.sh')

diff --git a/src/ob-checkbuilddeps.sh b/src/ob-checkbuilddeps.sh
index 40706c0..fde1bfd 100644
--- a/src/ob-checkbuilddeps.sh
+++ b/src/ob-checkbuilddeps.sh
@@ -19,7 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. '@@LIBDATADIR@@/libopkbuild.shso.1'
+. "${LIBDATADIR}/libopkbuild.shso.1"
 
 main()
 {
@@ -74,7 +74,7 @@ check_dep()
 	local pkg_ver=
 
 	ob_parse_dep -p dep_pkg -r dep_rel -v dep_ver "${dep}"
-	status="$(@@OPKG@@ status "${dep_pkg}")"
+	status="$("${OPKG}" status "${dep_pkg}")"
 
 	if ! printf '%s\n' "${status}" | grep '^Status: .* .* installed$' \
 			>/dev/null 2>&1; then
@@ -83,7 +83,7 @@ check_dep()
 	if [ "x${dep_rel}" != 'x' ]; then
 		pkg_ver="$(printf '%s\n' "${status}" | \
 			sed -n 's/^Version: //p')"
-		if @@OPKG@@ compare-versions \
+		if "${OPKG}" compare-versions \
 				"${pkg_ver}" "${dep_rel}" "${dep_ver}"; then
 			return 1
 		fi
--
cgit v0.9.1