From 5de8eda21c61fd7e1cf6b7e4ec6c9d98dae3e365 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Tue, 3 Oct 2023 12:59:35 +0100 Subject: general code cleanup in shell scripts Signed-off-by: Leah Rowe --- script/build/release/roms | 10 +++------- script/build/release/src | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'script/build/release') diff --git a/script/build/release/roms b/script/build/release/roms index 50560f98..3cf5d93e 100755 --- a/script/build/release/roms +++ b/script/build/release/roms @@ -31,10 +31,8 @@ main() init_check() { - [ -f version ] && \ - read version < version - [ -f versiondate ] && \ - read versiondate < versiondate + [ -f version ] && read version < version + [ -f versiondate ] && read versiondate < versiondate [ ! -d "bin/" ] && \ err "init_check: no ROMs built yet (error)" [ -d "release/" ] || \ @@ -106,9 +104,9 @@ make_archive() strip_archive() { romdir=${1} - [ -d "coreboot/${tree}" ] || \ x_ ./update project trees coreboot ${tree} + x_ ./build coreboot utils ${tree} if [ "${microcode_required}" = "n" ]; then @@ -125,12 +123,10 @@ strip_archive() # Hash the rom before removing blobs x_ rm -f "${romdir}/blobhashes" x_ touch "${romdir}/blobhashes" - ( x_ cd "${romdir}" x_ sha512sum *.rom >> blobhashes ) - for romfile in "${romdir}"/*.rom; do [ -f "${romfile}" ] || continue strip_rom_image "${romfile}" diff --git a/script/build/release/src b/script/build/release/src index 71b8e111..6dae201c 100755 --- a/script/build/release/src +++ b/script/build/release/src @@ -109,7 +109,7 @@ purge_files() done x_ ./handle make file -c bios_extract flashrom grub uefitool \ util-fw/stm32-vserprog util-fw/stm32-vserprog/libopencm3 \ - memtest86plus/build* util/* \ + memtest86plus/build* util/* x_ rm -Rf .git* */.git* */*/.git* */*/*/.git* */*/*/*/.git* \ */*/*/*/*/.git* */*/*/*/*/*/.git* */*/*/*/*/*/*/.git* -- cgit v1.2.1