summaryrefslogtreecommitdiffhomepage
path: root/subr
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2020-02-12 00:53:27 +0000
committerLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2020-02-12 00:53:27 +0000
commit12508d484b3c1a5bc5dca7dd1072936449702bbe (patch)
tree1c02e17aa8d98c4720a14040911bae32518d95f8 /subr
parent5e9851ad55094d5bb6f57233ead7676146406960 (diff)
downloadmidipix_build-12508d484b3c1a5bc5dca7dd1072936449702bbe.tar.bz2
midipix_build-12508d484b3c1a5bc5dca7dd1072936449702bbe.tar.xz
groups/*.group: split from vars/build.vars.
subr/build_init.subr: source groups/*.group & set ${GROUPS_DEFAULT}. vars/midipix.vars: merged into vars/env.vars.
Diffstat (limited to 'subr')
-rw-r--r--subr/build_init.subr10
1 files changed, 8 insertions, 2 deletions
diff --git a/subr/build_init.subr b/subr/build_init.subr
index b6c89ff4..27c1986f 100644
--- a/subr/build_init.subr
+++ b/subr/build_init.subr
@@ -22,7 +22,7 @@ build_fini() {
build_init() {
local __="" _env_vars="" _env_vars_except="" _env_var="" _log_last_fname="" _log_last_ts="" _vname="" _vname_val="";
- set -o noglob; umask 022;
+ umask 022;
if ! awk -V 2>/dev/null | grep -q "^GNU Awk "; then
ex_rtl_log_msg failexit "Error: awk(1) in \$PATH must be GNU Awk.";
fi;
@@ -48,9 +48,15 @@ build_init() {
fi;
ex_rtl_log_msg failexit "Error: invalid architecture \`${ARCH}'.";
fi;
- for __ in ${HOME}/midipix_build.vars ${HOME}/.midipix_build.vars ../midipix_build.vars ./vars/env.vars ./vars/midipix.vars ./vars/build.vars; do
+ for __ in ${HOME}/midipix_build.vars ${HOME}/.midipix_build.vars ../midipix_build.vars ./vars/env.vars; do
[ -e ${__} ] && . ${__};
done;
+ for __ in $(find ./groups -name *.group | sort); do
+ . "${__}"; __="${__##*/}"; __="${__%.group}";
+ if [ "${__#[0-9][0-9][0-9].*}" != "${__}" ]; then
+ GROUPS_DEFAULT="${GROUPS_DEFAULT:+${GROUPS_DEFAULT} }${__#*.}";
+ fi;
+ done;
if [ "${ARG_AS_NEEDED:-0}" -eq 1 ]\
&& [ -e "${PREFIX}/build.gitref" ]\
&& [ "$(git rev-parse HEAD)" = "$(cat "${PREFIX}/build.gitref")" ]; then