From 113dac006f65a468a09570e8dc9cde94cde3a7bd Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 16 Sep 2026 05:52:06 +0100 Subject: variable ./mk location, based on user input when calling ./mk, or from PATH, an absolute path is created to ./mk this will likely be different than mk, but it might be a different script. perhaps the operator is making a copy of the mk script temporarily - obviously not advised, no, but here we have a problem because then lbmk is still running ./mk everywhere run arg0 instead, now called "mk" ./mk is still hardcoded in release.sh, because we do need to make sure we're using the right script there Signed-off-by: Leah Rowe --- include/env/get.sh | 4 ++-- include/env/init.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'include/env') diff --git a/include/env/get.sh b/include/env/get.sh index f576fc99..0863615b 100644 --- a/include/env/get.sh +++ b/include/env/get.sh @@ -32,11 +32,11 @@ single_tree_fetch() fi [ -n "$xgcctree" ] && \ - x_ ./mk -f coreboot "$xgcctree" + x_ "$mk" -f coreboot "$xgcctree" [ -n "$depend" ] && \ for d in $depend ; do - x_ ./mk -f $d + x_ "$mk" -f $d done clone_project diff --git a/include/env/init.sh b/include/env/init.sh index ffd03407..d17b5fb8 100644 --- a/include/env/init.sh +++ b/include/env/init.sh @@ -348,7 +348,7 @@ xbmk_set_mirror() git_init() { - # the git identity check is only needed for: ./mk -b coreboot [args] + # the git identity check is only needed for: "$mk" -b coreboot [args] [ "${2-}" = "-b" ] && [ "${3-}" = "coreboot" ] && \ for gitarg in "user.name" "user.email"; do git config --includes $gitarg 1>/dev/null 2>/dev/null || \ @@ -381,7 +381,7 @@ xchild() { xbmk_rval=0 - ( x_ ./mk "$@" ) || xbmk_rval=1 + ( x_ "$mk" "$@" ) || xbmk_rval=1 ( x_ rm -Rf "$xbtmp" ) || xbmk_rval=1 ( x_ rm -f "$xbmklock" ) || xbmk_rval=1 -- cgit v1.2.1