summaryrefslogtreecommitdiffhomepage
path: root/subr.ex
diff options
context:
space:
mode:
authorLucía Andrea Illanes Albornoz <lucia@luciaillanes.de>2023-03-31 07:24:35 +0200
committerLucía Andrea Illanes Albornoz <lucia@luciaillanes.de>2023-03-31 07:24:35 +0200
commitbf1a8367732ec22832a02f05ad1c3146a37a76eb (patch)
treed1da84d177242d185bcf42c9feb5d1a717e3383c /subr.ex
parentd79f1f31e2c1cf820883cc94e144bb2ce48a29e3 (diff)
downloadmidipix_build-bf1a8367732ec22832a02f05ad1c3146a37a76eb.tar.bz2
midipix_build-bf1a8367732ec22832a02f05ad1c3146a37a76eb.tar.xz
Split up midipix.env into env.d/*.env.
Diffstat (limited to 'subr.ex')
-rw-r--r--subr.ex/ex_pkg.subr14
1 files changed, 12 insertions, 2 deletions
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}";