diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-09-18 23:35:12 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-09-18 23:35:12 +0100 |
| commit | c11c5a7a14a75abb2287b5ccab714d7b44c9c1c9 (patch) | |
| tree | b700427c85dddd9e43d828210b9ba19fc50c5528 /include/tree.sh | |
| parent | 14bcb3a6fa445cde3dd11db88f100fa037bd558d (diff) | |
Revert "xbmk: don't use backticks for command substitution"
This reverts commit 4999a49de39667b3239fc2010d0e99c958b29417.
Diffstat (limited to 'include/tree.sh')
| -rw-r--r-- | include/tree.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/tree.sh b/include/tree.sh index 44c41a6f..76b552f7 100644 --- a/include/tree.sh +++ b/include/tree.sh @@ -3,11 +3,11 @@ # Copyright (c) 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com> # Copyright (c) 2023-2025 Leah Rowe <leah@libreboot.org> -eval "$(setvars "" xarch srcdir premake gnatdir tree mode makeargs elfdir cmd \ +eval "`setvars "" xarch srcdir premake gnatdir xlang mode makeargs elfdir cmd \ project target target_dir targets xtree _f release bootstrapargs mkhelper \ autoconfargs listfile autogenargs btype rev build_depend gccdir cmakedir \ defconfig postmake mkhelpercfg dry dest_dir mdir cleanargs gccver gccfull \ - gnatver gnatfull do_make badhash badtghash xlang)" + gnatver gnatfull do_make badhash badtghash tree`" trees() { @@ -130,16 +130,16 @@ handle_defconfig() configure_project() { - eval "$(setvars "" cleanargs build_depend autoconfargs xtree postmake \ + eval "`setvars "" cleanargs build_depend autoconfargs xtree postmake \ makeargs btype mkhelper bootstrapargs premake release xlang xarch \ - badhash badtghash)" + badhash badtghash`" _tcfg="$1/target.cfg" [ -f "$_tcfg" ] || btype="auto" - e "$datadir/mkhelper.cfg" f && eval "$(setcfg "$datadir/mkhelper.cfg")" + e "$datadir/mkhelper.cfg" f && eval "`setcfg "$datadir/mkhelper.cfg"`" while e "$_tcfg" f || [ "$cmd" != "build_project" ]; do - eval "$(setvars "" rev tree)" - eval "$(setcfg "$_tcfg")" + eval "`setvars "" rev tree`" + eval "`setcfg "$_tcfg"`" printf "Loading %s config: %s\n" "$project" "$_tcfg" [ "$_f" = "-d" ] && build_depend="" # dry run @@ -194,7 +194,7 @@ delete_old_project_files() project_up_to_date() { - eval "$(setvars "" old_hash hash)" + eval "`setvars "" old_hash hash`" hashdir="$1" hashname="$2" badhashvar="$3" @@ -260,7 +260,7 @@ check_gnu_path() command -v "$1" 1>/dev/null || \ err "Host '$1' unavailable" "check_gnu_path" "$@" - eval "$(setvars "" gccver gccfull gnatver gnatfull gccdir gnatdir)" + eval "`setvars "" gccver gccfull gnatver gnatfull gccdir gnatdir`" x_ gnu_setver "$1" "$1" || \ err "Command '$1' unavailable." "check_gnu_path" "$@" gnu_setver "$2" "$2" || : @@ -291,7 +291,7 @@ check_gnu_path() gnu_setver() { eval "$2 --version 1>/dev/null 2>/dev/null || return 1" - eval "$1ver=\"$("$2" --version 2>/dev/null | head -n1)\"" + eval "$1ver=\"`"$2" --version 2>/dev/null | head -n1`\"" eval "$1ver=\"\${$1ver##* }\"" eval "$1full=\"\$$1ver\"" eval "$1ver=\"\${$1ver%%.*}\""; : |