From fd38dc025f5d31890abbf3d48c597114203b1421 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luc=C3=ADa=20Andrea=20Illanes=20Albornoz?=
 <lucia@luciaillanes.de>
Date: Mon, 13 Mar 2023 10:03:34 +0100
Subject: Move patches & vars pathname defaults handling into
 subr.ex/ex_pkg.subr.

---
 subr.ex/ex_pkg_env.subr | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'subr.ex/ex_pkg_env.subr')

diff --git a/subr.ex/ex_pkg_env.subr b/subr.ex/ex_pkg_env.subr
index f8966ad3..d6e8b803 100644
--- a/subr.ex/ex_pkg_env.subr
+++ b/subr.ex/ex_pkg_env.subr
@@ -118,9 +118,11 @@ exp_pkg_env_set() {
 # Return:			zero (0) on success, non-zero (>0) on failure
 #
 ex_pkg_env() {
-	local	_epe_build_steps_default="${1}" _epe_build_vars_default="${2}" _epe_group_name="${3}"	\
-		_epe_pkg_name="${4}" _epe_restart_at="${5}" _epe_workdir="${6}"				\
-		_epe_inherit_from="" _epe_vars_file="" _epe_vars_file_parent="" _epe_vname="";
+	local	_epe_build_steps_default="${1}" _epe_build_vars_default="${2}"		\
+		_epe_group_name="${3}" _epe_pkg_name="${4}" _epe_restart_at="${5}"	\
+		_epe_workdir="${6}"							\
+		_epe_inherit_from="" _epe_pkg_version="" _epe_vars_file=""		\
+		_epe_vars_file_parent="" _epe_vname="";
 
 	if rtl_get_var_unsafe \$_epe_inherit_from -u "PKG_${_epe_pkg_name}_INHERIT_FROM"\
 	&& [ "${_epe_inherit_from:+1}" = 1 ]; then
@@ -134,7 +136,11 @@ ex_pkg_env() {
 	fi;
 
 	if [ "${_epe_vars_file:+1}" != 1 ]; then
-		_epe_vars_file="vars/${_epe_pkg_name}.vars";
+		rtl_get_var_unsafe \$_epe_pkg_version -u "PKG_${_epe_pkg_name}_VERSION";
+		ex_pkg_get_default				\
+			\$_epe_vars_file "${_epe_pkg_name}"	\
+			"${_epe_pkg_version}" "vars_file" 1	\
+			|| return 1;
 	fi;
 
 	rtl_fileop source_opt "${_epe_vars_file}" "${_epe_group_name}/${_epe_pkg_name}.${_epe_group_name}";
-- 
cgit v1.2.3