From 57adbc6eb1f961ee9116904b667f30efb3f2de4f Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 23 Aug 2023 18:56:31 +0100 Subject: unify err functions across scripts include/err.sh this new handling also does mundane things, such as tell you what script b0rked Signed-off-by: Leah Rowe --- resources/scripts/build/boot/roms | 7 ++----- resources/scripts/build/boot/roms_helper | 6 +----- 2 files changed, 3 insertions(+), 10 deletions(-) (limited to 'resources/scripts/build/boot') diff --git a/resources/scripts/build/boot/roms b/resources/scripts/build/boot/roms index 44b7cb8e..f634918e 100755 --- a/resources/scripts/build/boot/roms +++ b/resources/scripts/build/boot/roms @@ -29,6 +29,8 @@ [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e +. "include/err.sh" + projectname="$(cat projectname)" opts="" boards= @@ -116,9 +118,4 @@ buildrom() { ./build boot roms_helper ${1}${opts} } -err() { - printf '%s\n' "${1}" 1>&2 - exit 1 -} - main $@ diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper index f78c7cc8..462b9403 100755 --- a/resources/scripts/build/boot/roms_helper +++ b/resources/scripts/build/boot/roms_helper @@ -30,11 +30,7 @@ [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e -err() -{ - printf "ERROR: build/boot/roms: %s\n" "${1}" 1>&2 - exit 1 -} +. "include/err.sh" projectname="$(cat projectname)" -- cgit v1.2.1