From d4d5d2902c020419057d63c9791804906a6c60dd Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sat, 22 Jun 2024 04:06:07 +0100
Subject: use backticks on eval commands, not subshells

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 script/roms  | 13 +++++++------
 script/trees | 10 +++++-----
 2 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'script')

diff --git a/script/roms b/script/roms
index 7b6f8685..9cfab81a 100755
--- a/script/roms
+++ b/script/roms
@@ -26,8 +26,8 @@ pv="payload_uboot payload_grub_withseabios payload_seabios payload_memtest t"
 pv="$pv payload_seabios_withgrub payload_seabios_grubonly payload_grub"
 v="romdir cbrom initmode displaymode cbcfg targetdir tree release ubootelf"
 v="$v grub_timeout board grub_scan_disk uboot_config grubtree grubelf tmpmv"
-eval "$(setvars "n" $pv)"
-eval "$(setvars "" $v boards targets serdir ser)"
+eval `setvars "n" $pv`
+eval `setvars "" $v boards targets serdir ser`
 
 main()
 {
@@ -88,7 +88,8 @@ serlist()
 
 configure_target()
 {
-	eval "$(setvars "n" $pv) $(setvars "" $v)"
+	eval `setvars "n" $pv`
+	eval `setvars "" $v`
 	board="$1"
 
 	targetdir="$cfgsdir/$board"
@@ -106,11 +107,11 @@ configure_target()
 	[ "$payload_memtest" != "y" ] && payload_memtest="n"
 	[ "$(uname -m)" = "x86_64" ] || payload_memtest="n"
 
-	[ "$payload_grub_withseabios" = "y" ] && eval "$(setvars "y" \
-	    payload_grub payload_seabios payload_seabios_withgrub)"
+	[ "$payload_grub_withseabios" = "y" ] && eval `setvars "y" \
+	    payload_grub payload_seabios payload_seabios_withgrub`
 	[ "$payload_seabios_withgrub" = "y" ] && payload_seabios="y"
 	[ "$payload_seabios_grubonly" = "y" ] && \
-		eval "$(setvars "y" payload_seabios payload_seabios_withgrub)"
+		eval `setvars "y" payload_seabios payload_seabios_withgrub`
 
 	# The reverse logic must not be applied. If SeaBIOS-with-GRUB works,
 	# that doesn't mean GRUB-with-SeaBIOS will, e.g. VGA ROM execution
diff --git a/script/trees b/script/trees
index 82c3ce84..7287280d 100755
--- a/script/trees
+++ b/script/trees
@@ -10,9 +10,9 @@ set -u -e
 . "include/git.sh"
 
 cbmakeargs="UPDATED_SUBMODULES=1 CPUS=$threads"
-eval "$(setvars "" xarch cdir config config_name xlang mode makeargs \
+eval `setvars "" xarch cdir config config_name xlang mode makeargs \
     listfile project target target_dir targets tree _f target1 bootstrapargs \
-    autoconfargs cmakedir elfdir autogenargs xtree)"
+    autoconfargs cmakedir elfdir autogenargs xtree`
 
 main()
 {
@@ -152,8 +152,8 @@ handle_src_tree()
 
 load_project_config()
 {
-	eval "$(setvars "" xarch xlang tree bootstrapargs autoconfargs xtree \
-	    tree_depend makeargs)"
+	eval `setvars "" xarch xlang tree bootstrapargs autoconfargs xtree \
+	    tree_depend makeargs`
 	eval `setcfg "$1/target.cfg" 0`; return 0
 }
 
@@ -272,7 +272,7 @@ check_makefile()
 
 mkpayload_grub()
 {
-	eval "$(setvars "" grub_modules grub_install_modules)"
+	eval `setvars "" grub_modules grub_install_modules`
 	eval `setcfg "$grubdata/module/$tree"`
 	chkvars "grub_install_modules" "grub_modules"
 
-- 
cgit v1.2.1