From bf1a8367732ec22832a02f05ad1c3146a37a76eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luc=C3=ADa=20Andrea=20Illanes=20Albornoz?=
 <lucia@luciaillanes.de>
Date: Fri, 31 Mar 2023 07:24:35 +0200
Subject: Split up midipix.env into env.d/*.env.

---
 subr.ex/ex_pkg.subr | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'subr.ex')

diff --git a/subr.ex/ex_pkg.subr b/subr.ex/ex_pkg.subr
index 8230cf79..3b3bba21 100644
--- a/subr.ex/ex_pkg.subr
+++ b/subr.ex/ex_pkg.subr
@@ -217,13 +217,23 @@ ex_pkg_load_vars() {
 		for _eplv_fname in				\
 				"${HOME}/midipix_build.vars"	\
 				"${HOME}/.midipix_build.vars"	\
-				../midipix_build.vars		\
-				./midipix.env;
+				../midipix_build.vars;
 		do
 			if [ -r "${_eplv_fname}" ]; then
 				rtl_fileop source "${_eplv_fname}";
 			fi;
 		done;
+
+		set +o noglob;
+		for _eplv_fname in				\
+				./env.d/*.env;
+		do
+			set -o noglob;
+			if [ -r "${_eplv_fname}" ]; then
+				rtl_fileop source "${_eplv_fname}";
+			fi;
+		done;
+		set -o noglob;
 	fi;
 
 	return "${_eplv_rc}";
-- 
cgit v1.2.3