coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-17 08:40:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

tree.sh: fix up copy_elf(), bad for loop

Browse Source 
Because of how sh works, having just the [] line causes
sh to exit, annoyingly without an error message, but it
does cause a non-zero exit.

This bug will have already been triggering, before I added
the recent error handling on files for this for loop.

also do it to the other loop in lib.sh

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2025-05-19 19:57:06 +01:00
parent 8aaf404dde
commit 900da04efa
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/lib.sh
+1 -1
View File
@@ -111,7 +111,7 @@ fx_()
dx_() dx_()
{ {
[ ! -f "$2" ] || while read -r fx; do [ ! -f "$2" ] || while read -r fx; do
$1 "$fx" || return 1 $1 "$fx" || return 1; :
done < "$2" || err "dx_ $*: cannot read '$2'"; : done < "$2" || err "dx_ $*: cannot read '$2'"; :
} }
include/tree.sh
+2 -2
View File
@@ -334,7 +334,7 @@ copy_elf()
{ {
[ -f "$listfile" ] && x_ mkdir -p "$dest_dir" [ -f "$listfile" ] && x_ mkdir -p "$dest_dir"
[ ! -f "$listfile" ] || while read -r f; do [ ! -f "$listfile" ] || while read -r f; do
[ -f "$srcdir/$f" ] && x_ cp "$srcdir/$f" "$dest_dir" [ -f "$srcdir/$f" ] && x_ cp "$srcdir/$f" "$dest_dir"; :
done < "$listfile" || err "copy_elf $*: cannot read '$listfile'" done < "$listfile" || err "copy_elf $*: cannot read '$listfile'"; :
x_ make clean -C "$srcdir" $cleanargs x_ make clean -C "$srcdir" $cleanargs
} }