diff options
| author | Leah Rowe <leah@libreboot.org> | 2024-06-28 14:59:52 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2024-06-28 15:02:11 +0100 |
| commit | 3f37c3788b62cfaf6f2f94ac733651c67f438f44 (patch) | |
| tree | 07a5426667debaf8354a7246e2fb073e16c14245 | |
| parent | ed3cce84bc2da88b72e727d9af53a765a1c3e288 (diff) | |
tidy up some setvars lists
Signed-off-by: Leah Rowe <leah@libreboot.org>
| -rwxr-xr-x | include/git.sh | 4 | ||||
| -rwxr-xr-x | include/lib.sh | 4 | ||||
| -rwxr-xr-x | script/trees | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/git.sh b/include/git.sh index a73bdc16..6818578b 100755 --- a/include/git.sh +++ b/include/git.sh @@ -2,8 +2,8 @@ # Copyright (c) 2020-2021,2023-2024 Leah Rowe <leah@libreboot.org> # Copyright (c) 2022 Caleb La Grange <thonkpeasant@protonmail.com> -eval `setvars "" _target rev loc url bkup_url depend tree_depend xtree \ - mdir subhash subrepo subrepo_bkup subfile subfile_bkup` +eval `setvars "" _target rev loc url bkup_url depend tree_depend xtree mdir \ + subhash subrepo subrepo_bkup subfile subfile_bkup` fetch_project_trees() { diff --git a/include/lib.sh b/include/lib.sh index 94d1997f..58aa8d46 100755 --- a/include/lib.sh +++ b/include/lib.sh @@ -36,8 +36,8 @@ chkvars() done; return 0 } -eval `setvars "" _nogit board relname versiondate projectsite \ - projectname aur_notice cfgsdir datadir version xbmk_parent` +eval `setvars "" _nogit board xbmk_parent versiondate projectsite projectname \ + aur_notice cfgsdir datadir version relname` for fv in projectname projectsite version versiondate; do eval "[ ! -f "$fv" ] || read -r $fv < \"$fv\" || :" diff --git a/script/trees b/script/trees index fa456631..6865a018 100755 --- a/script/trees +++ b/script/trees @@ -10,9 +10,9 @@ set -u -e . "include/git.sh" cbmakeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS" -eval `setvars "" xarch cdir config config_name xlang mode makeargs \ - elfdir project target target_dir targets tree _f target1 bootstrapargs \ - autoconfargs cmakedir listfile autogenargs xtree btype mkhelper` +eval `setvars "" xarch cdir config cmakedir xlang mode makeargs elfdir xtree \ + project target target_dir targets tree _f target1 bootstrapargs mkhelper \ + autoconfargs config_name listfile autogenargs btype` main() { |