diff options
| author | Leah Rowe <leah@libreboot.org> | 2023-09-27 21:46:20 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2023-09-27 22:31:24 +0100 |
| commit | 74c48a881df378a83e261c2785012609d81d801e (patch) | |
| tree | 52dcd41154762a823bf1d5d06c7a788536aea874 /script/build | |
| parent | a00b43375a7d4a33b6569c0b6ccb9e9291877bb5 (diff) | |
move build/command/options to include/option.sh
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'script/build')
| -rwxr-xr-x | script/build/boot/roms | 7 | ||||
| -rwxr-xr-x | script/build/command/options | 30 |
2 files changed, 4 insertions, 33 deletions
diff --git a/script/build/boot/roms b/script/build/boot/roms index c0c119b5..4b29f78f 100755 --- a/script/build/boot/roms +++ b/script/build/boot/roms @@ -9,6 +9,7 @@ set -u -e . "include/err.sh" +. "include/option.sh" read projectname < projectname opts="" @@ -23,7 +24,7 @@ main() firstoption="${1}" [ "${firstoption}" = "help" ] && usage && exit 0 [ "${firstoption}" = "list" ] && \ - ./build command options config/coreboot && exit 0 + listitems config/coreboot && exit 0 while [ $# -gt 0 ]; do case ${1} in @@ -46,7 +47,7 @@ main() printf "Building %s ROM images\n" "${projectname}" if [ "${firstoption}" = "all" ]; then - for target in $(./build command options config/coreboot); do + for target in $(listitems config/coreboot); do buildrom "${target}" || err "build/roms (1): error" [ -d "bin/${target}" ] && targets="${target} ${targets}" done @@ -81,7 +82,7 @@ usage() ./build boot roms x60 -p grub -d corebootfb -k usqwerty possible values for 'target': - $(./build command options "config/coreboot") + $(listitems "config/coreboot") Refer to the ${projectname} documentation for more information. EOF diff --git a/script/build/command/options b/script/build/command/options deleted file mode 100755 index e25daeea..00000000 --- a/script/build/command/options +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env sh -# SPDX-License-Identifier: MIT -# SPDX-FileCopyrightText: 2023 Leah Rowe <leah@libreboot.org> - -. "include/err.sh" - -items=1 - -main() -{ - [ $# -gt 0 ] || \ - err "No argument given" - listitems "${1}" || err "No items present under: ${1}" -} - -listitems() -{ - [ -d "${1}" ] || \ - err "Directory not does exist: ${1}" - for x in "${1}/"*; do - # -e used because this is for files *or* directories - [ -e "${x}" ] || continue - [ "${x##*/}" = "build.list" ] && continue - printf "%s\n" "${x##*/}" 2>/dev/null - items=0 - done - return ${items} -} - -main $@ |