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/release/roms | 8 ++------ resources/scripts/build/release/src | 7 ++----- 2 files changed, 4 insertions(+), 11 deletions(-) (limited to 'resources/scripts/build/release') diff --git a/resources/scripts/build/release/roms b/resources/scripts/build/release/roms index ca0e9fe7..2f9524c5 100755 --- a/resources/scripts/build/release/roms +++ b/resources/scripts/build/release/roms @@ -21,6 +21,8 @@ [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e +. "include/err.sh" + projectname="$(cat projectname)" version="version-unknown" versiondate="version-date-unknown" @@ -165,10 +167,4 @@ strip_rom_image() ${cbfstool} "${romfile}" remove -n "pci10de,06eb.rom" || exit 1 } -err() -{ - printf "%s: %s\n" $0 $1 - exit 1 -} - main $@ diff --git a/resources/scripts/build/release/src b/resources/scripts/build/release/src index ba09a3d3..3f9feb9b 100755 --- a/resources/scripts/build/release/src +++ b/resources/scripts/build/release/src @@ -21,6 +21,8 @@ [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e +. "include/err.sh" + projectname="$(cat projectname)" trees_fetch_list="coreboot u-boot" @@ -161,9 +163,4 @@ create_release_archive() ) } -err() -{ - printf "%s: %s\n" $0 $1 -} - main $@ -- cgit v1.2.1