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

xbmk: simplify a few err calls

Browse Source 
many of the messages are redundant, because errors caused
by the commands they handle would produce similar messages.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2025-05-27 11:57:13 +01:00
parent dbf0fda39a
commit aacd46bf81
4 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/get.sh
+1 -2
View File
@@ -106,8 +106,7 @@ try_file()
eval "[ -$echk \"$cached\" ] || return 1" eval "[ -$echk \"$cached\" ] || return 1"
if [ "$2" = "git" ]; then if [ "$2" = "git" ]; then
[ -d "$5" ] || tmpclone "$cached" "$5" "$6" "$7" || \ [ -d "$5" ] || tmpclone "$cached" "$5" "$6" "$7" || err; :
err "Can't clone final repo in command: try_file $*"; :
else else
bad_checksum "$6" "$cached" && x_ rm -f "$cached" && return 1 bad_checksum "$6" "$cached" && x_ rm -f "$cached" && return 1
[ "$cached" != "$5" ] && x_ cp "$cached" "$5" [ "$cached" != "$5" ] && x_ cp "$cached" "$5"
include/release.sh
+1 -2
View File
@@ -19,8 +19,7 @@ release()
done done
reldest="$reldir/$version" reldest="$reldir/$version"
[ -e "$reldest" ] && \ [ -e "$reldest" ] && err "already exists: \"$reldest\""
err "already exists: \"$reldest\""
vdir="$XBMK_CACHE/relpwd/${xbtmp##*/}/$version" vdir="$XBMK_CACHE/relpwd/${xbtmp##*/}/$version"
rsrc="$vdir/${relname}_src" rsrc="$vdir/${relname}_src"
include/rom.sh
+1 -2
View File
@@ -48,8 +48,7 @@ corebootpremake()
[ -n "$mode" ] || [ ! -f "$srcdir/.config" ] || $dry printf \ [ -n "$mode" ] || [ ! -f "$srcdir/.config" ] || $dry printf \
"CONFIG_CCACHE=y\n" >> "$srcdir/.config" || err "$srcdir: !cook"; : "CONFIG_CCACHE=y\n" >> "$srcdir/.config" || err "$srcdir: !cook"; :
fx_ check_coreboot_util printf "cbfstool\nifdtool\n" fx_ check_coreboot_util printf "cbfstool\nifdtool\n"
printf "%s\n" "${version%%-*}" > "$srcdir/.coreboot-version" || \ printf "%s\n" "${version%%-*}" > "$srcdir/.coreboot-version" || err
err "!mk $srcdir .coreboot-version"
[ -z "$mode" ] && [ "$target" != "$tree" ] && \ [ -z "$mode" ] && [ "$target" != "$tree" ] && \
x_ ./mk download "$target"; : x_ ./mk download "$target"; :
} }
include/tree.sh
+2 -4
View File
@@ -45,8 +45,7 @@ trees()
[ -z "$_f" ] && err "missing flag ($flags)" [ -z "$_f" ] && err "missing flag ($flags)"
[ -z "$project" ] && fx_ "x_ ./mk $_f" x_ ls -1 config/git && return 1 [ -z "$project" ] && fx_ "x_ ./mk $_f" x_ ls -1 config/git && return 1
[ -f "config/git/$project/pkg.cfg" ] || \ e "config/git/$project/pkg.cfg" f missing && err "$project: no pkg.cfg"
err "config/git/$project/pkg.cfg missing"
for d in "elf" "config/data" "config" "src"; do for d in "elf" "config/data" "config" "src"; do
eval "${d#*/}dir=\"$d/$project\"" eval "${d#*/}dir=\"$d/$project\""
@@ -187,8 +186,7 @@ check_project_hashes()
[ "$pjhash" != "$old_pjhash" ] && badhash="y" [ "$pjhash" != "$old_pjhash" ] && badhash="y"
[ -f "$XBMK_CACHE/hash/$project$tree" ] || badhash="y" [ -f "$XBMK_CACHE/hash/$project$tree" ] || badhash="y"
printf "%s\n" "$pjhash" > "$XBMK_CACHE/hash/$project$tree" || \ printf "%s\n" "$pjhash" > "$XBMK_CACHE/hash/$project$tree" || err
err "!mk $XBMK_CACHE/hash/$project$tree"
[ "$badhash" != "y" ] || x_ rm -Rf "src/$project/$tree" \ [ "$badhash" != "y" ] || x_ rm -Rf "src/$project/$tree" \
"elf/$project/$tree" "elf/$project/$target"; : "elf/$project/$tree" "elf/$project/$target"; :