lbmk: use x_ instead of err, where appropriate

many places in lbmk used err, because older versions
of x_ did not handle globbing properly.

however, use of x_ is preferable on trivial commands.

the only time err() should be called is what it has
to be, when x_ can't work, or when a more useful error
message is needed, for context.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2025-05-09 20:54:23 +01:00
parent 14d46abced
commit 81dbde7e09
7 changed files with 34 additions and 35 deletions
+3 -3
View File
@@ -61,7 +61,7 @@ git_prep()
[ "$XBMK_RELEASE" = "y" ] && rmgit "$tmpgit"
[ "$_loc" = "${_loc%/*}" ] || x_ mkdir -p "${_loc%/*}"
mv "$tmpgit" "$_loc" || err "git_prep: !mv $tmpgit $_loc"
x_ mv "$tmpgit" "$_loc"
}
fetch_submodule()
@@ -82,7 +82,7 @@ fetch_submodule()
[ "$st" = "file" ] && xbmkget "$subfile" "$subfile_bkup" \
"$tmpgit/$1" "$subhash" && return 0
rm -Rf "$tmpgit/$1" || err "!rm '$mdir' '$1'"
x_ rm -Rf "$tmpgit/$1"
tmpclone "$subrepo" "$subrepo_bkup" "$tmpgit/$1" "$subhash" \
"$mdir/${1##*/}/patches"
}
@@ -101,6 +101,6 @@ nuke()
{
e "config/${1%/}/nuke.list" f missing || while read -r nukefile; do
rmf="src/${2%/}/$nukefile" && [ -L "$rmf" ] && continue
e "$rmf" e missing || rm -Rf "$rmf" || err "!rm $rmf, ${2%/}"
e "$rmf" e missing || x_ rm -Rf "$rmf"
done < "config/${1%/}/nuke.list"; :
}