diff options
| author | Leah Rowe <leah@libreboot.org> | 2023-09-30 18:41:57 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2023-09-30 19:09:25 +0100 |
| commit | 0a0defd3256ff5e29e3b4d129a04fb7546bc31ac (patch) | |
| tree | 479d686f0578b506dbe3f862300e73c090ed8bcc /script/build/release | |
| parent | 49b266eb4248f87d111e9babae86a873300afa03 (diff) | |
simplify initialising variables in shell scripts
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'script/build/release')
| -rwxr-xr-x | script/build/release/roms | 10 | ||||
| -rwxr-xr-x | script/build/release/src | 10 |
2 files changed, 5 insertions, 15 deletions
diff --git a/script/build/release/roms b/script/build/release/roms index b19d404c..4a18037d 100755 --- a/script/build/release/roms +++ b/script/build/release/roms @@ -11,11 +11,8 @@ read projectname < projectname version="version-unknown" versiondate="version-date-unknown" tree="default" -target="" -CONFIG_HAVE_MRC="" -CONFIG_HAVE_ME_BIN="" -CONFIG_KBC1126_FIRMWARE="" -CONFIG_INCLUDE_SMSC_SCH5545_EC_FW="" +eval "$(setvars "" target CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \ + CONFIG_KBC1126_FIRMWARE CONFIG_INCLUDE_SMSC_SCH5545_EC_FW)" ifdtool="cbutils/${tree}/ifdtool" cbfstool="cbutils/${tree}/cbfstool" microcode_required="y" @@ -25,12 +22,10 @@ main() printf "Building ROM image archives for version %s\n" "${version}" init_check - for romdir in bin/*; do [ -d "${romdir}" ] || continue make_archive "${romdir}" done - printf "\nROM archives available at release/%s/roms/\n\n" "${version}" } @@ -51,7 +46,6 @@ init_check() [ ! -d "release/${version}/roms/" ] || \ rm -Rf "release/${version}/roms/" || \ err "init_check: !rm -Rf release/${version}/roms/" - if [ ! -d "release/${version}/roms/" ]; then mkdir -p "release/${version}/roms/" || \ err "init_check: !mkdir -p release/${version}/roms/" diff --git a/script/build/release/src b/script/build/release/src index 2e80b0c4..c29869f5 100755 --- a/script/build/release/src +++ b/script/build/release/src @@ -21,18 +21,14 @@ filelist="${filelist} checkversion" version="version-unknown" versiondate="version-date-unknown" -reldir="" -dirname="" -srcdir="" +eval "$(setvars "" reldir dirname srcdir)" printf "Building source code archive, version %s\n" "${version}" main() { - [ -f version ] && \ - read version < version - [ -f versiondate ] && \ - read versiondate < versiondate + [ -f version ] && read version < version + [ -f versiondate ] && read versiondate < versiondate create_release_directory download_modules |