summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-06-22 04:06:07 +0100
committerLeah Rowe <leah@libreboot.org>2024-06-22 13:46:20 +0100
commitd4d5d2902c020419057d63c9791804906a6c60dd (patch)
treeb917503650c905f6590d9fedec7ea60023cedc71 /include
parentc1527b6114e94530c50b00ff22ef03ea048e4bd1 (diff)
use backticks on eval commands, not subshells
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include')
-rwxr-xr-xinclude/git.sh12
-rwxr-xr-xinclude/lib.sh4
-rwxr-xr-xinclude/mrc.sh2
-rwxr-xr-xinclude/vendor.sh6
4 files changed, 12 insertions, 12 deletions
diff --git a/include/git.sh b/include/git.sh
index a10fb014..0c2e816c 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 _xm loc url bkup_url depend tree_depend xtree \
- mdir subhash subrepo subrepo_bkup subfile subfile_bkup)"
+eval `setvars "" _target rev _xm loc url bkup_url depend tree_depend xtree \
+ mdir subhash subrepo subrepo_bkup subfile subfile_bkup`
fetch_project_trees()
{
@@ -17,9 +17,9 @@ fetch_project_trees()
fetch_config()
{
rm -f "$cfgsdir/"*/seen || $err "fetch_config $cfgsdir: !rm seen"
- eval "$(setvars "" xtree tree_depend)"
+ eval `setvars "" xtree tree_depend`
while true; do
- eval "$(setvars "" rev tree)"
+ eval `setvars "" rev tree`
_xm="fetch_config $project/$_target"
load_target_config "$_target"
[ "$_target" = "$tree" ] && break
@@ -47,7 +47,7 @@ prepare_new_tree()
fetch_project_repo()
{
- eval "$(setvars "" xtree tree_depend)"
+ eval `setvars "" xtree tree_depend`
eval `setcfg "config/git/$project/pkg.cfg"`
chkvars url
@@ -111,7 +111,7 @@ prep_submodules()
fetch_submodule()
{
mcfgdir="$mdir/${1##*/}"
- eval $(setvars "" subhash subrepo subrepo_bkup subfile subfile_bkup st)
+ eval `setvars "" subhash subrepo subrepo_bkup subfile subfile_bkup st`
[ ! -f "$mcfgdir/module.cfg" ] || . "$mcfgdir/module.cfg" || \
$err "! . $mcfgdir/module.cfg"
diff --git a/include/lib.sh b/include/lib.sh
index c7c0c38d..c62bf98f 100755
--- a/include/lib.sh
+++ b/include/lib.sh
@@ -42,8 +42,8 @@ chkvars()
done
}
-eval "$(setvars "" xbmk_release tmpdir _nogit version board boarddir relname \
- versiondate threads projectname projectsite aur_notice cfgsdir datadir)"
+eval `setvars "" xbmk_release tmpdir _nogit version board boarddir relname \
+ versiondate threads projectname projectsite aur_notice cfgsdir datadir`
read -r projectname < projectname || :
read -r projectsite < projectsite || :
diff --git a/include/mrc.sh b/include/mrc.sh
index fddaef5d..2e00d9f9 100755
--- a/include/mrc.sh
+++ b/include/mrc.sh
@@ -4,7 +4,7 @@
# Modifications in this version are Copyright 2021, 2023 and 2024 Leah Rowe.
# Original copyright detailed in repo: https://review.coreboot.org/coreboot/
-eval "$(setvars "" MRC_url MRC_url_bkup MRC_hash MRC_board SHELLBALL)"
+eval `setvars "" MRC_url MRC_url_bkup MRC_hash MRC_board SHELLBALL`
extract_mrc()
{
diff --git a/include/vendor.sh b/include/vendor.sh
index c8512337..949ffc48 100755
--- a/include/vendor.sh
+++ b/include/vendor.sh
@@ -14,7 +14,7 @@ vendir="vendorfiles"
appdir="$vendir/app"
cbcfgsdir="config/coreboot"
-eval "$(setvars "" EC_url_bkup EC_hash DL_hash DL_url_bkup MRC_refcode_gbe \
+eval `setvars "" EC_url_bkup EC_hash DL_hash DL_url_bkup MRC_refcode_gbe vcfg \
E6400_VGA_DL_hash E6400_VGA_DL_url E6400_VGA_DL_url_bkup E6400_VGA_offset \
E6400_VGA_romname CONFIG_HAVE_MRC SCH5545EC_DL_url_bkup SCH5545EC_DL_hash \
mecleaner kbc1126_ec_dump MRC_refcode_cbtree new_mac _dl SCH5545EC_DL_url \
@@ -24,7 +24,7 @@ eval "$(setvars "" EC_url_bkup EC_hash DL_hash DL_url_bkup MRC_refcode_gbe \
CONFIG_VGA_BIOS_FILE CONFIG_VGA_BIOS_ID CONFIG_KBC1126_FW1 release DL_url \
CONFIG_INCLUDE_SMSC_SCH5545_EC_FW CONFIG_SMSC_SCH5545_EC_FW_FILE nukemode \
CONFIG_IFD_BIN_PATH CONFIG_MRC_FILE CONFIG_HAVE_REFCODE_BLOB cbfstoolref \
- CONFIG_REFCODE_BLOB_FILE vcfg)"
+ CONFIG_REFCODE_BLOB_FILE`
vendor_download()
{
@@ -390,7 +390,7 @@ inject()
{
[ $# -lt 3 ] && $err "$@, $rom: usage: inject name path type (offset)"
- eval "$(setvars "" cbfsname _dest _t _offset)"
+ eval `setvars "" cbfsname _dest _t _offset`
cbfsname="$1"
_dest="${2##*../}"
_t="$3"