diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-05-27 11:57:13 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-05-27 11:57:13 +0100 |
| commit | aacd46bf812369710a0080b7e51f1a1c7d1ce9ee (patch) | |
| tree | e4a05c126b812dc782e29a3684fcea988808692b /include | |
| parent | dbf0fda39a78504e76d24e907db130b542cb286a (diff) | |
xbmk: simplify a few err calls
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/get.sh | 3 | ||||
| -rw-r--r-- | include/release.sh | 3 | ||||
| -rw-r--r-- | include/rom.sh | 3 | ||||
| -rw-r--r-- | include/tree.sh | 6 |
4 files changed, 5 insertions, 10 deletions
diff --git a/include/get.sh b/include/get.sh index a3328454..4b31c7c9 100644 --- a/include/get.sh +++ b/include/get.sh @@ -106,8 +106,7 @@ try_file() eval "[ -$echk \"$cached\" ] || return 1" if [ "$2" = "git" ]; then - [ -d "$5" ] || tmpclone "$cached" "$5" "$6" "$7" || \ - err "Can't clone final repo in command: try_file $*"; : + [ -d "$5" ] || tmpclone "$cached" "$5" "$6" "$7" || err; : else bad_checksum "$6" "$cached" && x_ rm -f "$cached" && return 1 [ "$cached" != "$5" ] && x_ cp "$cached" "$5" diff --git a/include/release.sh b/include/release.sh index 912687dc..c13be2c3 100644 --- a/include/release.sh +++ b/include/release.sh @@ -19,8 +19,7 @@ release() done reldest="$reldir/$version" - [ -e "$reldest" ] && \ - err "already exists: \"$reldest\"" + [ -e "$reldest" ] && err "already exists: \"$reldest\"" vdir="$XBMK_CACHE/relpwd/${xbtmp##*/}/$version" rsrc="$vdir/${relname}_src" diff --git a/include/rom.sh b/include/rom.sh index 1eb199cd..972f264e 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -48,8 +48,7 @@ corebootpremake() [ -n "$mode" ] || [ ! -f "$srcdir/.config" ] || $dry printf \ "CONFIG_CCACHE=y\n" >> "$srcdir/.config" || err "$srcdir: !cook"; : fx_ check_coreboot_util printf "cbfstool\nifdtool\n" - printf "%s\n" "${version%%-*}" > "$srcdir/.coreboot-version" || \ - err "!mk $srcdir .coreboot-version" + printf "%s\n" "${version%%-*}" > "$srcdir/.coreboot-version" || err [ -z "$mode" ] && [ "$target" != "$tree" ] && \ x_ ./mk download "$target"; : } diff --git a/include/tree.sh b/include/tree.sh index 11607eed..e8f55c48 100644 --- a/include/tree.sh +++ b/include/tree.sh @@ -45,8 +45,7 @@ trees() [ -z "$_f" ] && err "missing flag ($flags)" [ -z "$project" ] && fx_ "x_ ./mk $_f" x_ ls -1 config/git && return 1 - [ -f "config/git/$project/pkg.cfg" ] || \ - err "config/git/$project/pkg.cfg missing" + e "config/git/$project/pkg.cfg" f missing && err "$project: no pkg.cfg" for d in "elf" "config/data" "config" "src"; do eval "${d#*/}dir=\"$d/$project\"" @@ -187,8 +186,7 @@ check_project_hashes() [ "$pjhash" != "$old_pjhash" ] && badhash="y" [ -f "$XBMK_CACHE/hash/$project$tree" ] || badhash="y" - printf "%s\n" "$pjhash" > "$XBMK_CACHE/hash/$project$tree" || \ - err "!mk $XBMK_CACHE/hash/$project$tree" + printf "%s\n" "$pjhash" > "$XBMK_CACHE/hash/$project$tree" || err [ "$badhash" != "y" ] || x_ rm -Rf "src/$project/$tree" \ "elf/$project/$tree" "elf/$project/$target"; : |