libreboot

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README

commit 5ff0c88449bb5bf03e4e38246565d3272fca1db5
parent bedc62fdada9e0e7a67b82153b186689dda07145
Author: Swift Geek <swiftgeek@gmail.com>
Date:   Sun, 29 Oct 2017 04:46:17 +0000

Merge branch 'readability-changes' of kragle/libreboot into master

Diffstat:
libreboot | 50+++++++++++++++++++++++++-------------------------
libs/common | 46+++++++++++++++++++++++-----------------------
libs/git | 92++++++++++++++++++++++++++++++++++++++++----------------------------------------
libs/project | 236++++++++++++++++++++++++++++++++++++++++----------------------------------------
libs/tool | 60++++++++++++++++++++++++++++++------------------------------
projects/cbfstool/cbfstool | 8++++----
projects/cbmem/cbmem | 4++--
projects/coreboot/coreboot | 12++++++------
projects/cros-ec/cros-ec | 14+++++++-------
projects/cros-scripts/install/cros-boot-keys | 18+++++++++---------
projects/cros-scripts/install/cros-firmware-prepare | 44++++++++++++++++++++++----------------------
projects/cros-scripts/install/cros-kernel-install | 28++++++++++++++--------------
projects/cros-scripts/install/cros-kernel-prepare | 26+++++++++++++-------------
projects/cros-scripts/install/cros-medium-setup | 22+++++++++++-----------
projects/crossgcc/crossgcc | 36++++++++++++++++++------------------
projects/crossgcc/crossgcc-helper | 8++++----
projects/depthcharge/depthcharge | 12++++++------
projects/flashmap/flashmap | 4++--
projects/flashrom-cros/flashrom-cros | 4++--
projects/flashrom/flashrom | 4++--
projects/hdctools/hdctools | 4++--
projects/libpayload/libpayload | 10+++++-----
projects/libreboot-release/install/libreboot-release | 40++++++++++++++++++++--------------------
projects/libreboot-release/libreboot-release | 2+-
projects/libreboot-sources/install/libreboot-sources | 14+++++++-------
projects/libreboot-sources/libreboot-sources | 6+++---
projects/mosys/mosys | 6+++---
projects/nvramtool/nvramtool | 4++--
projects/vboot/vboot | 16++++++++--------
projects/vpd/vpd | 4++--
tools/blobs-discover/blobs-discover | 60++++++++++++++++++++++++++++++------------------------------
tools/boot-keys/boot-keys | 28++++++++++++++--------------
tools/boot-keys/boot-keys-helper | 16++++++++--------
33 files changed, 469 insertions(+), 469 deletions(-)

diff --git a/libreboot b/libreboot @@ -23,52 +23,52 @@ libreboot_usage() { local action local target - printf '%s\n' "$executable [action] [target] [arguments]" >&2 + printf 1>&2 '%s\n' "$executable [action] [target] [arguments]" - printf '\n%s\n' 'Generic project actions:' >&2 + printf 1>&2 '\n%s\n' 'Generic project actions:' for action in "${PROJECT_ACTIONS_GENERIC[@]}"; do - printf '%s\n' " $action" >&2 + printf 1>&2 '%s\n' " $action" done - printf '\n%s\n' 'Virtual project actions:' >&2 - printf '%s\n' ' sources' - printf '%s\n' ' produce' - printf '%s\n' ' test' + printf 1>&2 '\n%s\n' 'Virtual project actions:' + printf 1>&2 '%s\n' ' sources' + printf 1>&2 '%s\n' ' produce' + printf 1>&2 '%s\n' ' test' - printf '\n%s\n' 'Project targets:' >&2 + printf 1>&2 '\n%s\n' 'Project targets:' for target in "$root/$PROJECTS"/*; do if project_check "$target"; then - printf '%s\n' " $target" >&2 + printf 1>&2 '%s\n' " $target" fi done - printf '\n%s\n' 'Generic tool actions:' >&2 + printf 1>&2 '\n%s\n' 'Generic tool actions:' for action in "${TOOL_ACTIONS_GENERIC[@]}"; do - printf '%s\n' " $action" >&2 + printf 1>&2 '%s\n' " $action" done - printf '\n%s\n' 'Tool targets:' >&2 + printf 1>&2 '\n%s\n' 'Tool targets:' for target in "$root/$TOOLS"/*; do if tool_check "$target"; then - printf '%s\n' " $target" >&2 + printf 1>&2 '%s\n' " $target" fi done - printf '\n%s\n' 'Environment variables:' >&2 - printf '%s\n' ' PROJECTS_FORCE - Projects to always perform actions for' >&2 - printf '%s\n' ' TOOLS_FORCE - Tools to always perform actions for' >&2 - printf '%s\n' ' RELEASE_KEY - GPG key to use for release' >&2 - printf '%s\n' ' VBOOT_KEYS_PATH - Path to the vboot keys' >&2 - printf '%s\n' ' LIBFAKETIME_PATH - Path to the libfaketime shared library' >&2 - printf '%s\n' ' TASKS - Number of simultaneous tasks to run' >&2 - printf '%s\n' ' VERSION - Version string to use' >&2 - - printf '\n%s\n' 'Configuration files:' >&2 - printf '%s\n' " $BUILD_SYSTEM.conf - Environment variables configuration" >&2 + printf 1>&2 '\n%s\n' 'Environment variables:' + printf 1>&2 '%s\n' ' PROJECTS_FORCE - Projects to always perform actions for' + printf 1>&2 '%s\n' ' TOOLS_FORCE - Tools to always perform actions for' + printf 1>&2 '%s\n' ' RELEASE_KEY - GPG key to use for release' + printf 1>&2 '%s\n' ' VBOOT_KEYS_PATH - Path to the vboot keys' + printf 1>&2 '%s\n' ' LIBFAKETIME_PATH - Path to the libfaketime shared library' + printf 1>&2 '%s\n' ' TASKS - Number of simultaneous tasks to run' + printf 1>&2 '%s\n' ' VERSION - Version string to use' + + printf 1>&2 '\n%s\n' 'Configuration files:' + printf 1>&2 '%s\n' " $BUILD_SYSTEM.conf - Environment variables configuration" } libreboot_project() { @@ -82,7 +82,7 @@ libreboot_project() { if project_action_arguments 'extract' "$project" "$@"; then return else - printf '\n%s\n\n' 'Attempting to download instead...' + printf 1>&2 '\n%s\n\n' 'Attempting to download instead...' project_action_arguments 'download' "$project" "$@" fi ;; diff --git a/libs/common b/libs/common @@ -130,7 +130,7 @@ path_wildcard_expand() { local path=$@ # Evaluation fails with unescaped whitespaces. - path=$( printf '%s\n' "$path" | sed "s/ /\\\ /g" ) + path=$(printf '%s\n' "$path" | sed "s/ /\\\ /g") eval "arguments_list "$path"" } @@ -139,8 +139,8 @@ file_checksum_create() { local path=$1 local checksum_path="$path.$CHECKSUM" - local name=$( basename "$path" ) - local directory_path=$( dirname "$path" ) + local name=$(basename "$path") + local directory_path=$(dirname "$path") ( cd "$directory_path" @@ -152,12 +152,12 @@ file_checksum_check() { local path=$1 local checksum_path="$path.$CHECKSUM" - local name=$( basename "$path" ) - local directory_path=$( dirname "$path" ) + local name=$(basename "$path") + local directory_path=$(dirname "$path") - if ! [ -f "$checksum_path" ] + if ! [[ -f "$checksum_path" ]] then - printf '%s\n' 'Could not verify file checksum!' >&2 + printf 1>&2 '%s\n' 'Could not verify file checksum!' return 1 fi @@ -172,7 +172,7 @@ file_signature_create() { local signature_path="$path.$DSIG" - if [ -z "$RELEASE_KEY" ] + if [[ -z "$RELEASE_KEY" ]] then return 0 fi @@ -185,9 +185,9 @@ file_signature_check() { local signature_path="$path.$DSIG" - if ! [ -f "$signature_path" ] + if ! [[ -f "$signature_path" ]] then - printf '%s\n' 'Could not verify file signature!' >&2 + printf 1>&2 '%s\n' 'Could not verify file signature!' return 1 fi @@ -217,7 +217,7 @@ file_exists_check() { directory_filled_check() { local path=$1 - if [ -z "$( ls -A "$path" 2> /dev/null )" ] + if [[ -z "$(ls -A "$path" 2> /dev/null)" ]] then return 1 else @@ -379,11 +379,11 @@ requirements() { for requirement in "$@" do - requirement_path=$( which "$requirement" || true ) + requirement_path=$(which "$requirement" || true) - if [ -z "$requirement_path" ] + if [[ -z "$requirement_path" ]] then - printf '%s\n' "Missing requirement: $requirement" >&2 + printf 1>&2 '%s\n' "Missing requirement: $requirement" exit 1 fi done @@ -396,11 +396,11 @@ requirements_root() { for requirement in "$@" do # We need to keep stdout output to show the command. - requirement_path=$( execute_root which "$requirement" || true ) + requirement_path=$(execute_root which "$requirement" || true) - if [ -z "$requirement_path" ] + if [[ -z "$requirement_path" ]] then - printf '%s\n' "Missing requirement: $requirement" >&2 + printf 1>&2 '%s\n' "Missing requirement: $requirement" exit 1 fi done @@ -414,7 +414,7 @@ arguments_concat() { for argument in "$@" do - if ! [ -z "$concat" ] + if [[ -n "$concat" ]] then concat="$concat""$delimiter""$argument" else @@ -426,18 +426,18 @@ arguments_concat() { } execute_root() { - local sudo=$( which sudo 2> /dev/null || true ) + local sudo=$(which sudo 2> /dev/null || true) local arguments - printf '%s' 'Running command as root: ' >&2 - printf '%b\n' "$*" >&2 + printf 1>&2 '%s' 'Running command as root: ' + printf 1>&2 '%b\n' "$*" - if ! [ -z "$sudo" ] + if [[ -n "$sudo" ]] then sudo "$@" else # Quote arguments for eval through su. - arguments=$( printf '%q ' "$@" ) + arguments=$(printf '%q ' "$@") su -c "$arguments" fi } diff --git a/libs/git b/libs/git @@ -63,7 +63,7 @@ git_branch_create() { cd "$repository_path" git checkout -B "$branch" - if ! [ -z "$revision" ] + if [[ -n "$revision" ]] then git reset --hard "$revision" fi @@ -96,13 +96,13 @@ git_branch_check() { ( cd "$repository_path" 2> /dev/null > /dev/null - if [ $? -ne 0 ] + if [[ $? -ne 0 ]] then return 1 fi git rev-parse --verify "$branch" 2> /dev/null > /dev/null - if [ $? -ne 0 ] + if [[ $? -ne 0 ]] then return 1 fi @@ -123,13 +123,13 @@ git_fetch_check() { ( cd "$repository_path" 2> /dev/null > /dev/null - if [ $? -ne 0 ] + if [[ $? -ne 0 ]] then return 1 fi - local output=$( git fetch --dry-run origin 2>&1 ) - if ! [ -z "$output" ] + local output=$(git fetch --dry-run origin 2>&1) + if [[ -n "$output" ]] then return 1 fi @@ -220,7 +220,7 @@ git_project_repository_path() { git_project_check() { local repository=$1 - local repository_path=$( git_project_repository_path "$repository" ) + local repository_path=$(git_project_repository_path "$repository") git_check "$repository_path" } @@ -257,8 +257,8 @@ git_project_clone() { shift local urls=$@ - local repository_path=$( git_project_repository_path "$repository" ) - local directory_path=$( dirname "$repository_path" ) + local repository_path=$(git_project_repository_path "$repository") + local directory_path=$(dirname "$repository_path") local url mkdir -p "$directory_path" @@ -270,7 +270,7 @@ git_project_clone() { do git_clone "$repository_path" "$url" - if [ $? -eq 0 ] + if [[ $? -eq 0 ]] then return 0 fi @@ -297,11 +297,11 @@ git_project_prepare_blobs() { local repository=$1 shift - local repository_path=$( git_project_repository_path "$repository" ) - local blobs_path=$( project_blobs_path "$project" "$@" ) + local repository_path=$(git_project_repository_path "$repository") + local blobs_path=$(project_blobs_path "$project" "$@") local blob - if ! [ -f "$blobs_path" ] + if ! [[ -f "$blobs_path" ]] then return fi @@ -320,7 +320,7 @@ git_project_prepare_patch() { local repository=$1 shift - local project_path=$( project_path "$project" ) + local project_path=$(project_path "$project") local configs_path="$project_path/$CONFIGS" local prepare_branch local prepare_path @@ -330,9 +330,9 @@ git_project_prepare_patch() { for argument in "" "$@" do - if ! [ -z "$argument" ] + if [[ -n "$argument" ]] then - if [ -z "$path" ] + if [[ -z "$path" ]] then path="$argument" else @@ -344,7 +344,7 @@ git_project_prepare_patch() { local revision_path="$configs_path/$path/$REVISION" - if ! [ -f "$revision_path" ] + if ! [[ -f "$revision_path" ]] then continue fi @@ -353,7 +353,7 @@ git_project_prepare_patch() { prepare_path=$path done - if ! [ -z "$prepare_branch" ] + if [[ -n "$prepare_branch" ]] then git_project_patch_recursive "$project" "$repository" "$prepare_branch" "$prepare_path" fi @@ -365,8 +365,8 @@ git_project_prepare_revision() { local repository=$1 shift - local repository_path=$( git_project_repository_path "$repository" ) - local project_path=$( project_path "$project" ) + local repository_path=$(git_project_repository_path "$repository") + local project_path=$(project_path "$project") local configs_path="$project_path/$CONFIGS" local prepare_branch local prepare_revision @@ -376,9 +376,9 @@ git_project_prepare_revision() { for argument in "" "$@" do - if ! [ -z "$argument" ] + if [[ -n "$argument" ]] then - if [ -z "$path" ] + if [[ -z "$path" ]] then path="$argument" else @@ -390,16 +390,16 @@ git_project_prepare_revision() { local revision_path="$configs_path/$path/$REVISION" - if ! [ -f "$revision_path" ] + if ! [[ -f "$revision_path" ]] then continue fi prepare_branch=$branch - prepare_revision=$( cat "$revision_path" ) + prepare_revision=$(cat "$revision_path") done - if ! [ -z "$prepare_branch" ] + if [[ -n "$prepare_branch" ]] then git_branch_create "$repository_path" "$prepare_branch" "$prepare_revision" fi @@ -411,8 +411,8 @@ git_project_prepare_check() { local repository=$1 shift - local repository_path=$( git_project_repository_path "$repository" ) - local project_path=$( project_path "$project" ) + local repository_path=$(git_project_repository_path "$repository") + local project_path=$(project_path "$project") local configs_path="$project_path/$CONFIGS" local prepare_branch local branch=$project @@ -421,9 +421,9 @@ git_project_prepare_check() { for argument in "" "$@" do - if ! [ -z "$argument" ] + if [[ -n "$argument" ]] then - if [ -z "$path" ] + if [[ -z "$path" ]] then path="$argument" else @@ -435,7 +435,7 @@ git_project_prepare_check() { local revision_path="$configs_path/$path/$REVISION" - if ! [ -f "$revision_path" ] + if ! [[ -f "$revision_path" ]] then continue fi @@ -443,7 +443,7 @@ git_project_prepare_check() { prepare_branch=$branch done - if ! [ -z "$prepare_branch" ] + if [[ -n "$prepare_branch" ]] then git_branch_check "$repository_path" "$prepare_branch" fi @@ -455,14 +455,14 @@ git_project_prepare_clean() { local repository=$1 shift - local repository_path=$( git_project_repository_path "$repository" ) + local repository_path=$(git_project_repository_path "$repository") local prepare_branch local branch=$project local argument for argument in "" "$@" do - if ! [ -z "$argument" ] + if [[ -n "$argument" ]] then branch="$branch-$argument" fi @@ -475,7 +475,7 @@ git_project_prepare_clean() { prepare_branch=$branch done - if ! [ -z "$prepare_branch" ] + if [[ -n "$prepare_branch" ]] then # Let's not worry about missing branches. ( @@ -483,7 +483,7 @@ git_project_prepare_clean() { git_branch_delete "$repository_path" "$prepare_branch" - if [ $? -ne 0 ] + if [[ $? -ne 0 ]] then return 0 fi @@ -497,14 +497,14 @@ git_project_checkout() { local repository=$1 shift - local repository_path=$( git_project_repository_path "$repository" ) + local repository_path=$(git_project_repository_path "$repository") local checkout_branch local branch=$project local argument for argument in "" "$@" do - if ! [ -z "$argument" ] + if [[ -n "$argument" ]] then branch="$branch-$argument" fi @@ -517,7 +517,7 @@ git_project_checkout() { checkout_branch=$branch done - if ! [ -z "$checkout_branch" ] + if [[ -n "$checkout_branch" ]] then git_branch_checkout "$repository_path" "$checkout_branch" git_submodule_update "$repository_path" @@ -530,7 +530,7 @@ git_project_update() { local repository=$1 shift - local repository_path=$( git_project_repository_path "$repository" ) + local repository_path=$(git_project_repository_path "$repository") git_fetch "$repository_path" git_branch_checkout "$repository_path" "$ORIGIN_HEAD" @@ -557,14 +557,14 @@ git_project_release() { shift local arguments=$@ - local repository_path=$( git_project_repository_path "$repository" ) + local repository_path=$(git_project_repository_path "$repository") local release_branch local branch=$project local argument for argument in "" "$@" do - if ! [ -z "$argument" ] + if [[ -n "$argument" ]] then branch="$branch-$argument" fi @@ -577,7 +577,7 @@ git_project_release() { release_branch=$branch done - if ! [ -z "$release_branch" ] + if [[ -n "$release_branch" ]] then local archive_path="$root/$RELEASE/$SOURCES/$project/$release_branch.$ARCHIVE" local sources_path="$root/$SOURCES/$repository" @@ -598,14 +598,14 @@ git_project_release_check() { local repository=$1 shift - local repository_path=$( git_project_repository_path "$repository" ) + local repository_path=$(git_project_repository_path "$repository") local release_branch local branch=$project local argument for argument in "" "$@" do - if ! [ -z "$argument" ] + if [[ -n "$argument" ]] then branch="$branch-$argument" fi @@ -618,13 +618,13 @@ git_project_release_check() { release_branch=$branch done - if ! [ -z "$release_branch" ] + if [[ -n "$release_branch" ]] then local archive_path="$root/$RELEASE/$SOURCES/$project/$release_branch.$ARCHIVE" file_exists_check "$archive_path" - if [ $? -ne 0 ] + if [[ $? -ne 0 ]] then return 1 else diff --git a/libs/project b/libs/project @@ -24,7 +24,7 @@ INSTALL_REGEX='\([^:]*\):\(.*\)' project_include() { local project=$1 - local project_path=$( project_path "$project" ) + local project_path=$(project_path "$project") unset -f "${PROJECT_ACTIONS[@]}" @@ -36,10 +36,10 @@ project_include() { project_helper_include() { local project=$1 - local project_path=$( project_path "$project" ) + local project_path=$(project_path "$project") local include="$project_path/$project-helper" - if [ -f "$include" ] + if [[ -f "$include" ]] then source "$include" fi @@ -81,12 +81,12 @@ project_action() { project_action_check "$action" "$project" "$@" - printf '%s\n' "Project $project $action (with ${arguments:-no argument})" >&2 + printf 1>&2 '%s\n' "Project $project $action (with ${arguments:-no argument})" if "$action" "$@"; then - printf '\n%s\n' "Project $project $action (with ${arguments:-no argument}) completed" >&2 + printf 1>&2 '\n%s\n' "Project $project $action (with ${arguments:-no argument}) completed" else - printf '\n%s\n' "Project $project $action (with ${arguments:-no argument}) failed" >&2 + printf 1>&2 '\n%s\n' "Project $project $action (with ${arguments:-no argument}) failed" return 1 fi ) @@ -171,7 +171,7 @@ project_action_arguments_verify_recursive() { test="$(printf '%s\n' "$action_helper_arguments" | grep -e "^$argument\$" || true)" if [[ -z "$test" ]]; then - printf '%s\n' "Invalid argument $argument for project $project action $action" >&2 + printf 1>&2 '%s\n' "Invalid argument $argument for project $project action $action" return 1 fi fi @@ -254,7 +254,7 @@ project_sources_path() { for argument in "" "$@" do - if ! [ -z "$argument" ] + if [[ -n "$argument" ]] then path="$path-$argument" fi @@ -267,7 +267,7 @@ project_sources_path() { sources_path=$path done - if ! [ -z "$sources_path" ] + if [[ -n "$sources_path" ]] then printf '%s\n' "$sources_path" return @@ -287,7 +287,7 @@ project_sources_path() { for argument in "" "$@" do - if ! [ -z "$argument" ] + if [[ -n "$argument" ]] then path="$path/$argument" fi @@ -300,7 +300,7 @@ project_sources_path() { sources_path=$path done - if ! [ -z "$sources_path" ] + if [[ -n "$sources_path" ]] then printf '%s\n' "$sources_path" return @@ -311,7 +311,7 @@ project_sources_directory_filled_check() { local project=$1 shift - local sources_path=$( project_sources_path "$project" "$@" ) + local sources_path=$(project_sources_path "$project" "$@") test ! -z "$sources_path" } @@ -321,11 +321,11 @@ project_sources_directory_filled_error() { shift local arguments="$*" - local sources_path=$( project_sources_path "$project" "$@" ) + local sources_path=$(project_sources_path "$project" "$@") - if ! [ -z "$sources_path" ] + if [[ -n "$sources_path" ]] then - printf '%s\n' "Sources directory for project $project (with ${arguments:-no argument}) already exists" >&2 + printf 1>&2 '%s\n' "Sources directory for project $project (with ${arguments:-no argument}) already exists" return 1 else return 0 @@ -337,11 +337,11 @@ project_sources_directory_missing_empty_error() { shift local arguments="$*" - local sources_path=$( project_sources_path "$project" "$@" ) + local sources_path=$(project_sources_path "$project" "$@") - if [ -z "$sources_path" ] + if [[ -z "$sources_path" ]] then - printf '%s\n' "Sources directory for project $project (with ${arguments:-no argument}) missing or empty" >&2 + printf 1>&2 '%s\n' "Sources directory for project $project (with ${arguments:-no argument}) missing or empty" return 1 else return 0 @@ -358,14 +358,14 @@ project_sources_archive() { for argument in "" "$@" do - if ! [ -z "$argument" ] + if [[ -n "$argument" ]] then path="$path-$argument" fi local archive="$path.$ARCHIVE" - if ! [ -f "$archive" ] + if ! [[ -f "$archive" ]] then continue fi @@ -373,7 +373,7 @@ project_sources_archive() { sources_archive=$archive done - if ! [ -z "$sources_archive" ] + if [[ -n "$sources_archive" ]] then printf '%s\n' "$sources_archive" fi @@ -384,8 +384,8 @@ project_sources_archive_extract() { shift local arguments="$*" - local archive=$( project_sources_archive "$project" "$@" ) - local destination=$( dirname "$archive" ) + local archive=$(project_sources_archive "$project" "$@") + local destination=$(dirname "$archive") printf '%s\n' "Extracting source archive for $project (with ${arguments:-no argument})" @@ -399,11 +399,11 @@ project_sources_archive_update() { local arguments="$*" local repository=$project - local sources_path=$( project_sources_path "$project" "$repository" "$@" ) - local archive=$( project_sources_archive "$project" "$@" ) - local destination=$( dirname "$archive" ) + local sources_path=$(project_sources_path "$project" "$repository" "$@") + local archive=$(project_sources_archive "$project" "$@") + local destination=$(dirname "$archive") - if [ -d "$sources_path" ] + if [[ -d "$sources_path" ]] then rm -rf "$sources_path" fi @@ -419,10 +419,10 @@ project_sources_archive_missing_error() { shift local arguments="$*" - local archive=$( project_sources_archive "$project" "$@" ) - if [ -z "$archive" ] || ! [ -f "$archive" ] + local archive=$(project_sources_archive "$project" "$@") + if [[ -z "$archive" ]] || ! [[ -f "$archive" ]] then - printf '%s\n' "Missing sources archive for $project (with ${arguments:-no argument})" >&2 + printf 1>&2 '%s\n' "Missing sources archive for $project (with ${arguments:-no argument})" return 1 else return 0 @@ -433,8 +433,8 @@ project_sources_archive_missing_check() { local project=$1 shift - local archive=$( project_sources_archive "$project" "$@" ) - if [ -z "$archive" ] || ! [ -f "$archive" ] + local archive=$(project_sources_archive "$project" "$@") + if [[ -z "$archive" ]] || ! [[ -f "$archive" ]] then return 0 else @@ -467,16 +467,16 @@ project_blobs_path() { local project=$1 shift - local project_path=$( project_path "$project" ) + local project_path=$(project_path "$project") local configs_path="$project_path/$CONFIGS" local argument local path for argument in "" "$@" do - if ! [ -z "$argument" ] + if [[ -n "$argument" ]] then - if [ -z "$path" ] + if [[ -z "$path" ]] then path="$argument" else @@ -486,7 +486,7 @@ project_blobs_path() { local blobs_path="$configs_path/$path/$BLOBS" - if [ -f "$blobs_path" ] + if [[ -f "$blobs_path" ]] then printf '%s\n' "$blobs_path" return @@ -500,16 +500,16 @@ project_blobs_ignore_path() { local project=$1 shift - local project_path=$( project_path "$project" ) + local project_path=$(project_path "$project") local configs_path="$project_path/$CONFIGS" local argument local path for argument in "" "$@" do - if ! [ -z "$argument" ] + if [[ -n "$argument" ]] then - if [ -z "$path" ] + if [[ -z "$path" ]] then path="$argument" else @@ -519,7 +519,7 @@ project_blobs_ignore_path() { blobs_ignore_path="$configs_path/$path/$BLOBS_IGNORE" - if [ -f "$blobs_ignore_path" ] + if [[ -f "$blobs_ignore_path" ]] then printf '%s\n' "$blobs_ignore_path" return @@ -531,7 +531,7 @@ project_arguments_targets() { local project=$1 shift - local project_path=$( project_path "$project" ) + local project_path=$(project_path "$project") local targets_path="$project_path/$CONFIGS" local argument @@ -542,7 +542,7 @@ project_arguments_targets() { targets_path="$targets_path/$TARGETS" - if [ -f "$targets_path" ] + if [[ -f "$targets_path" ]] then cat "$targets_path" fi @@ -737,8 +737,8 @@ project_build_check() { local project=$1 shift - local project_path=$( project_path "$project" ) - local build_path=$( project_build_path "$project" "$@" ) + local project_path=$(project_path "$project") + local build_path=$(project_build_path "$project" "$@") local source_file_path local argument local rule @@ -746,9 +746,9 @@ project_build_check() { for argument in "" "$@" do - if ! [ -z "$argument" ] + if [[ -n "$argument" ]] then - if [ -z "$path" ] + if [[ -z "$path" ]] then path="$argument" else @@ -758,20 +758,20 @@ project_build_check() { configs_install_path="$project_path/$CONFIGS/$path/$INSTALL" - if ! [ -f "$configs_install_path" ] + if ! [[ -f "$configs_install_path" ]] then continue fi while read -r rule do - source=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\1/g" ) + source=$(printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\1/g") source_path="$build_path/$source" # Source may contain a wildcard. path_wildcard_expand "$source_path" | while read -r source_file_path do - if ! [ -f "$source_file_path" ] && ! [ -d "$source_file_path" ] + if ! [[ -f "$source_file_path" ]] && ! [[ -d "$source_file_path" ]] then false fi @@ -800,11 +800,11 @@ project_build_directory_missing_empty_error() { shift local arguments="$*" - local build_path=$( project_build_path "$project" "$@" ) + local build_path=$(project_build_path "$project" "$@") if ! directory_filled_check "$build_path" then - printf '%s\n' "Build directory for project $project (with ${arguments:-no argument}) missing or empty" >&2 + printf 1>&2 '%s\n' "Build directory for project $project (with ${arguments:-no argument}) missing or empty" return 1 else return 0 @@ -815,9 +815,9 @@ project_install() { local project=$1 shift - local project_path=$( project_path "$project" ) - local build_path=$( project_build_path "$project" "$@" ) - local install_path=$( project_install_path "$project" "$@" ) + local project_path=$(project_path "$project") + local build_path=$(project_build_path "$project" "$@") + local install_path=$(project_install_path "$project" "$@") local source_file_path local argument local rule @@ -826,9 +826,9 @@ project_install() { # Install built files first. for argument in "" "$@" do - if ! [ -z "$argument" ] + if [[ -n "$argument" ]] then - if [ -z "$path" ] + if [[ -z "$path" ]] then path="$argument" else @@ -838,7 +838,7 @@ project_install() { configs_install_path="$project_path/$CONFIGS/$path/$INSTALL" - if ! [ -f "$configs_install_path" ] + if ! [[ -f "$configs_install_path" ]] then continue fi @@ -847,12 +847,12 @@ project_install() { while read -r rule do - source=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\1/g" ) + source=$(printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\1/g") source_path="$build_path/$source" - destination=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\2/g" ) + destination=$(printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\2/g") destination_path="$install_path/$destination" - destination_directory_path=$( dirname "$destination_path" ) + destination_directory_path=$(dirname "$destination_path") mkdir -p "$destination_directory_path" @@ -869,9 +869,9 @@ project_install() { # Install install files then. for argument in "" "$@" do - if ! [ -z "$argument" ] + if [[ -n "$argument" ]] then - if [ -z "$path" ] + if [[ -z "$path" ]] then path="$argument" else @@ -881,19 +881,19 @@ project_install() { install_install_path="$project_path/$INSTALL/$path/$INSTALL" - if ! [ -f "$install_install_path" ] + if ! [[ -f "$install_install_path" ]] then continue fi while read -r rule do - source=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\1/g" ) + source=$(printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\1/g") source_path="$project_path/$INSTALL/$path/$source" - destination=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\2/g" ) + destination=$(printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\2/g") destination_path="$install_path/$destination" - destination_directory_path=$( dirname "$destination_path" ) + destination_directory_path=$(dirname "$destination_path") mkdir -p "$destination_directory_path" @@ -910,9 +910,9 @@ project_install_check() { local project=$1 shift - local project_path=$( project_path "$project" ) - local build_path=$( project_build_path "$project" "$@" ) - local install_path=$( project_install_path "$project" "$@" ) + local project_path=$(project_path "$project") + local build_path=$(project_build_path "$project" "$@") + local install_path=$(project_install_path "$project" "$@") local argument local rule local path @@ -920,9 +920,9 @@ project_install_check() { # Install built files first. for argument in "" "$@" do - if ! [ -z "$argument" ] + if [[ -n "$argument" ]] then - if [ -z "$path" ] + if [[ -z "$path" ]] then path="$argument" else @@ -932,7 +932,7 @@ project_install_check() { configs_install_path="$project_path/$CONFIGS/$path/$INSTALL" - if ! [ -f "$configs_install_path" ] + if ! [[ -f "$configs_install_path" ]] then continue fi @@ -941,10 +941,10 @@ project_install_check() { while read -r rule do - destination=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\2/g" ) + destination=$(printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\2/g") destination_path="$install_path/$destination" - if ! [ -f "$destination_path" ] && ! [ -d "$destination_path" ] + if ! [[ -f "$destination_path" ]] && ! [[ -d "$destination_path" ]] then false fi @@ -956,9 +956,9 @@ project_install_check() { # Install install files then. for argument in "" "$@" do - if ! [ -z "$argument" ] + if [[ -n "$argument" ]] then - if [ -z "$path" ] + if [[ -z "$path" ]] then path="$argument" else @@ -968,17 +968,17 @@ project_install_check() { install_install_path="$project_path/$INSTALL/$path/$INSTALL" - if ! [ -f "$install_install_path" ] + if ! [[ -f "$install_install_path" ]] then continue fi while read -r rule do - destination=$( printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\2/g" ) + destination=$(printf '%s\n' "$rule" | sed "s/$INSTALL_REGEX/\\2/g") destination_path="$install_path/$destination" - if ! [ -f "$destination_path" ] && ! [ -d "$destination_path" ] + if ! [[ -f "$destination_path" ]] && ! [[ -d "$destination_path" ]] then false fi @@ -1006,11 +1006,11 @@ project_install_directory_missing_empty_error() { shift local arguments="$*" - local install_path=$( project_install_path "$project" "$@" ) + local install_path=$(project_install_path "$project" "$@") if ! directory_filled_check "$install_path" then - printf '%s\n' "Install directory for project $project (with ${arguments:-no argument}) missing or empty" >&2 + printf 1>&2 '%s\n' "Install directory for project $project (with ${arguments:-no argument}) missing or empty" return 1 else return 0 @@ -1025,9 +1025,9 @@ project_release_path() { local release_path="$root/$RELEASE/$prefix" # Special care for tools and systems, that depend on the host arch. - if [ "$prefix" = "$SYSTEMS" ] || [ "$prefix" = "$TOOLS" ] + if [[ "$prefix" = "$SYSTEMS" ]] || [[ "$prefix" = "$TOOLS" ]] then - local machine=$( uname -m ) + local machine=$(uname -m) release_path="$release_path/$machine/$project" else @@ -1043,7 +1043,7 @@ project_release_archive_path() { local prefix=$1 shift - local release_path=$( project_release_path "$project" "$prefix" ) + local release_path=$(project_release_path "$project" "$prefix") local argument local path="$project" @@ -1063,7 +1063,7 @@ project_release_rootfs_path() { local prefix=$1 shift - local release_path=$( project_release_path "$project" "$prefix" ) + local release_path=$(project_release_path "$project" "$prefix") local argument local path="$project" @@ -1088,7 +1088,7 @@ project_release_sources_archive_path() { for argument in "" "$@" do - if ! [ -z "$argument" ] + if [[ -n "$argument" ]] then path="$path-$argument" fi @@ -1103,7 +1103,7 @@ project_release_sources_archive_path() { release_path=$path done - if ! [ -z "$release_path" ] + if [[ -n "$release_path" ]] then local archive_path="$root/$RELEASE/$SOURCES/$project/$release_path.$ARCHIVE" @@ -1117,8 +1117,8 @@ project_release_sources_archive_create() { local arguments="$*" local repository=$project - local archive_path=$( project_release_sources_archive_path "$project" "$@" ) - local sources_path=$( project_sources_path "$project" "$repository" "$@" ) + local archive_path=$(project_release_sources_archive_path "$project" "$@") + local sources_path=$(project_sources_path "$project" "$repository" "$@") printf '%s\n' "Releasing sources archive for $project (with ${arguments:-no argument})" @@ -1130,8 +1130,8 @@ project_release_sources_archive_exists_check() { local project=$1 shift - local archive_path=$( project_release_sources_archive_path "$project" "$@" ) - if [ -z "$archive_path" ] || ! [ -f "$archive_path" ] + local archive_path=$(project_release_sources_archive_path "$project" "$@") + if [[ -z "$archive_path" ]] || ! [[ -f "$archive_path" ]] then return 1 else @@ -1185,20 +1185,20 @@ project_release_install() { local prefix=$1 shift - local install_path=$( project_install_path "$project" "$@" ) - local release_path=$( project_release_path "$project" "$prefix" ) + local install_path=$(project_install_path "$project" "$@") + local release_path=$(project_release_path "$project" "$prefix") local directory_path local path project_install_directory_missing_empty_error "$project" "$@" - local files=$( find "$install_path" -type f || true ) + local files=$(find "$install_path" -type f || true) local file printf '%s\n' "$files" | while read -r file do path="$release_path/$file" - directory_path=$( dirname "$path" ) + directory_path=$(dirname "$path") mkdir -p "$directory_path" @@ -1213,13 +1213,13 @@ project_release_install_check() { local prefix=$1 shift - local install_path=$( project_install_path "$project" "$@" ) - local release_path=$( project_release_path "$project" "$prefix" ) + local install_path=$(project_install_path "$project" "$@") + local release_path=$(project_release_path "$project" "$prefix") local path project_install_directory_missing_empty_error "$project" "$@" - local files=$( find "$install_path" -type f || true ) + local files=$(find "$install_path" -type f || true) local file printf '%s\n' "$files" | while read -r file @@ -1255,8 +1255,8 @@ project_release_install_archive_create() { shift local arguments="$*" - local install_path=$( project_install_path "$project" "$@" ) - local archive_path=$( project_release_archive_path "$project" "$prefix" "$@" ) + local install_path=$(project_install_path "$project" "$@") + local archive_path=$(project_release_archive_path "$project" "$prefix" "$@") printf '%s\n' "Releasing $prefix archive for $project (with ${arguments:-no argument})" @@ -1270,7 +1270,7 @@ project_release_install_archive_exists_check() { local prefix=$1 shift - local archive_path=$( project_release_archive_path "$project" "$prefix" "$@" ) + local archive_path=$(project_release_archive_path "$project" "$prefix" "$@") file_exists_check "$archive_path" } @@ -1303,8 +1303,8 @@ project_release_install_rootfs_create() { shift local arguments="$*" - local install_path=$( project_install_path "$project" "$@" ) - local rootfs_path=$( project_release_rootfs_path "$project" "$prefix" "$@" ) + local install_path=$(project_install_path "$project" "$@") + local rootfs_path=$(project_release_rootfs_path "$project" "$prefix" "$@") printf '%s\n' "Releasing $prefix rootfs for $project (with ${arguments:-no argument})" @@ -1318,7 +1318,7 @@ project_release_install_rootfs_exists_check() { local prefix=$1 shift - local rootfs_path=$( project_release_rootfs_path "$project" "$prefix" "$@" ) + local rootfs_path=$(project_release_rootfs_path "$project" "$prefix" "$@") file_exists_check "$rootfs_path" } @@ -1336,7 +1336,7 @@ project_clean_build() { local project=$1 shift - local build_path=$( project_build_path "$project" "$@" ) + local build_path=$(project_build_path "$project" "$@") rm -rf "$build_path" } @@ -1345,7 +1345,7 @@ project_clean_install() { local project=$1 shift - local install_path=$( project_install_path "$project" "$@" ) + local install_path=$(project_install_path "$project" "$@") rm -rf "$install_path" } @@ -1358,7 +1358,7 @@ project_clean_release() { for prefix in "$SOURCES" "$SYSTEMS" "$IMAGES" "$TOOLS" "$DOCS" do - local release_path=$( project_release_path "$project" "$prefix" ) + local release_path=$(project_release_path "$project" "$prefix") rm -rf "$release_path" done @@ -1378,7 +1378,7 @@ project_clean_rootfs_install() { local project=$1 shift - local install_path=$( project_install_path "$project" "$@" ) + local install_path=$(project_install_path "$project" "$@") execute_root rm -rf "$install_path" @@ -1392,19 +1392,19 @@ project_file_path() { local file=$1 shift - local project_path=$( project_path "$project" ) + local project_path=$(project_path "$project") local path="$project_path/$directory" local argument local file_path for argument in "" "$@" do - if ! [ -z "$argument" ] + if [[ -n "$argument" ]] then path="$path/$argument" fi - if ! [ -f "$path/$file" ] + if ! [[ -f "$path/$file" ]] then continue fi @@ -1412,7 +1412,7 @@ project_file_path() { file_path="$path/$file" done - if [ -z "$file_path" ] + if [[ -z "$file_path" ]] then return 1 fi @@ -1421,15 +1421,15 @@ project_file_path() { } project_file_test() { - local file_path=$( project_file_path "$@" ) + local file_path=$(project_file_path "$@") test -f "$file_path" } project_file_contents() { - local file_path=$( project_file_path "$@" ) + local file_path=$(project_file_path "$@") - if [ -f "$file_path" ] + if [[ -f "$file_path" ]] then cat "$file_path" fi @@ -1443,21 +1443,21 @@ project_file_contents_herit() { local file=$1 shift - local project_path=$( project_path "$project" ) + local project_path=$(project_path "$project") local path="$project_path/$directory" local argument local file_path for argument in "" "$@" do - if ! [ -z "$argument" ] + if [[ -n "$argument" ]] then path="$path/$argument" fi file_path="$path/$file" - if ! [ -f "$file_path" ] + if ! [[ -f "$file_path" ]] then continue fi diff --git a/libs/tool b/libs/tool @@ -22,11 +22,11 @@ TOOL_ACTIONS_HELPERS=(arguments) tool_include() { local tool=$1 - local tool_path=$( tool_path "$tool" ) + local tool_path=$(tool_path "$tool") unset -f "${TOOL_ACTIONS[@]}" - . "$tool_path/$tool" + source "$tool_path/$tool" tool_helper_include "$tool" } @@ -34,12 +34,12 @@ tool_include() { tool_helper_include() { local tool=$1 - local tool_path=$( tool_path "$tool" ) + local tool_path=$(tool_path "$tool") local include="$tool_path/$tool-helper" - if [ -f "$include" ] + if [[ -f "$include" ]] then - . "$include" + source "$include" fi } @@ -79,13 +79,13 @@ tool_action() { if ! tool_check "$tool" then - printf '%s\n' "Tool $tool check failed" >&2 + printf 1>&2 '%s\n' "Tool $tool check failed" return 1 fi tool_action_check "$action" "$tool" "$@" - if [ $? -eq 0 ] + if [[ $? -eq 0 ]] then return 0 fi @@ -97,19 +97,19 @@ tool_action() { return 0 fi - printf '%s\n' "Tool $tool $action (with ${arguments:-no argument})" >&2 + printf 1>&2 '%s\n' "Tool $tool $action (with ${arguments:-no argument})" ( set -e "$action" "$@" ) - if [ $? -ne 0 ] + if [[ $? -ne 0 ]] then - printf '\n%s\n' "Tool $tool $action (with ${arguments:-no argument}) failed" >&2 + printf 1>&2 '\n%s\n' "Tool $tool $action (with ${arguments:-no argument}) failed" return 1 else - printf '\n%s\n' "Tool $tool $action (with ${arguments:-no argument}) completed" >&2 + printf 1>&2 '\n%s\n' "Tool $tool $action (with ${arguments:-no argument}) completed" fi ) } @@ -125,7 +125,7 @@ tool_action_check() { if ! tool_check "$tool" then - printf '%s\n' "Tool $tool check failed" >&2 + printf 1>&2 '%s\n' "Tool $tool check failed" return 1 fi @@ -138,7 +138,7 @@ tool_action_check() { for tool_force in $TOOLS_FORCE do - if [ "$tool_force" = "$tool" ] + if [[ "$tool_force" = "$tool" ]] then return 1 fi @@ -162,7 +162,7 @@ tool_action_helper() { if ! tool_check "$tool" then - printf '%s\n' "Tool $tool check failed" >&2 + printf 1>&2 '%s\n' "Tool $tool check failed" return 1 fi @@ -186,10 +186,10 @@ tool_action_arguments_recursive() { local tool=$1 shift - local action_helper_arguments=$( tool_action_helper "arguments" "$tool" "$@" ) + local action_helper_arguments=$(tool_action_helper "arguments" "$tool" "$@") local argument - if [ $? -ne 0 ] || [ -z "$action_helper_arguments" ] + if [[ $? -ne 0 ]] || [[ -z "$action_helper_arguments" ]] then tool_action "$action" "$tool" "$@" else @@ -236,7 +236,7 @@ tool_sources_path() { for argument in "" "$@" do - if ! [ -z "$argument" ] + if [[ -n "$argument" ]] then path="$path/$argument" fi @@ -263,7 +263,7 @@ tool_usage_actions() { fi done - if [ $# -gt 0 ] + if [[ $# -gt 0 ]] then printf '\n%s\n' 'Specific actions:' @@ -289,10 +289,10 @@ tool_usage_arguments_recursive() { local spacing=$1 shift - local action_helper_arguments=$( tool_action_helper "arguments" "$tool" "$@" ) + local action_helper_arguments=$(tool_action_helper "arguments" "$tool" "$@") local argument - if ! [ -z "$action_helper_arguments" ] + if [[ -n "$action_helper_arguments" ]] then printf '%s\n' "$action_helper_arguments" | while read argument do @@ -310,19 +310,19 @@ tool_file_path() { local file=$1 shift - local tool_path=$( tool_path "$tool" ) + local tool_path=$(tool_path "$tool") local path="$tool_path/$directory" local argument local file_path for argument in "" "$@" do - if ! [ -z "$argument" ] + if [[ -n "$argument" ]] then path="$path/$argument" fi - if ! [ -f "$path/$file" ] + if ! [[ -f "$path/$file" ]] then continue fi @@ -330,7 +330,7 @@ tool_file_path() { file_path="$path/$file" done - if [ -z "$file_path" ] + if [[ -z "$file_path" ]] then return 1 fi @@ -339,15 +339,15 @@ tool_file_path() { } tool_file_test() { - local file_path=$( tool_file_path "$@" ) + local file_path=$(tool_file_path "$@") test -f "$file_path" } tool_file_contents() { - local file_path=$( tool_file_path "$@" ) + local file_path=$(tool_file_path "$@") - if [ -f "$file_path" ] + if [[ -f "$file_path" ]] then cat "$file_path" fi @@ -361,21 +361,21 @@ tool_file_contents_herit() { local file=$1 shift - local tool_path=$( tool_path "$tool" ) + local tool_path=$(tool_path "$tool") local path="$tool_path/$directory" local argument local file_path for argument in "" "$@" do - if ! [ -z "$argument" ] + if [[ -n "$argument" ]] then path="$path/$argument" fi file_path="$path/$file" - if ! [ -f "$file_path" ] + if ! [[ -f "$file_path" ]] then continue fi diff --git a/projects/cbfstool/cbfstool b/projects/cbfstool/cbfstool @@ -56,12 +56,12 @@ build() { project_sources_directory_missing_empty_error "$project" "$repository" "$@" - local coreboot_sources_path=$( project_sources_path "$project" "$repository" "$@" ) + local coreboot_sources_path=$(project_sources_path "$project" "$repository" "$@") local sources_path="$coreboot_sources_path/util/cbfstool/" - local build_path=$( project_build_path "$project" "$@" ) - local build_util_path=$( dirname "$build_path" ) + local build_path=$(project_build_path "$project" "$@") + local build_util_path=$(dirname "$build_path") - local vboot_sources_path=$( project_sources_path "vboot" "vboot" "devices" ) + local vboot_sources_path=$(project_sources_path "vboot" "vboot" "devices") if git_project_check "$repository" then diff --git a/projects/cbmem/cbmem b/projects/cbmem/cbmem @@ -56,9 +56,9 @@ build() { project_sources_directory_missing_empty_error "$project" "$repository" "$@" - local coreboot_sources_path=$( project_sources_path "$project" "$repository" "$@" ) + local coreboot_sources_path=$(project_sources_path "$project" "$repository" "$@") local sources_path="$coreboot_sources_path/util/cbmem/" - local build_path=$( project_build_path "$project" "$@" ) + local build_path=$(project_build_path "$project" "$@") if git_project_check "$repository" then diff --git a/projects/coreboot/coreboot b/projects/coreboot/coreboot @@ -64,15 +64,15 @@ build() { project_sources_directory_missing_empty_error "$project" "$repository" "$payload" "$@" - local sources_path=$( project_sources_path "$project" "$repository" "$payload" "$@" ) - local build_path=$( project_build_path "$project" "$payload" "$@" ) - local config_path=$( coreboot_config_path "$payload" "$@" ) + local sources_path=$(project_sources_path "$project" "$repository" "$payload" "$@") + local build_path=$(project_build_path "$project" "$payload" "$@") + local config_path=$(coreboot_config_path "$payload" "$@") - local arch=$( coreboot_arch "$payload" "$@" ) + local arch=$(coreboot_arch "$payload" "$@") - local crossgcc_build_path=$( project_build_path "crossgcc" "$arch" ) + local crossgcc_build_path=$(project_build_path "crossgcc" "$arch") local crossgcc_bin_path="$crossgcc_build_path/bin/" - local vboot_sources_path=$( project_sources_path "vboot" "vboot" "devices" ) + local vboot_sources_path=$(project_sources_path "vboot" "vboot" "devices") if git_project_check "$repository" then diff --git a/projects/cros-ec/cros-ec b/projects/cros-ec/cros-ec @@ -63,8 +63,8 @@ build() { project_sources_directory_missing_empty_error "$project" "$repository" "$@" - local sources_path=$( project_sources_path "$project" "$repository" "$@" ) - local build_path=$( project_build_path "$project" "$@" ) + local sources_path=$(project_sources_path "$project" "$repository" "$@") + local build_path=$(project_build_path "$project" "$@") if git_project_check "$repository" then @@ -73,15 +73,15 @@ build() { mkdir -p "$build_path" - if [ "$target" = "tools" ] + if [[ "$target" = "tools" ]] then make -C "$sources_path" out="$build_path" HOST_CROSS_COMPILE= -j$TASKS "utils" else local arch="arm" - local config=$( cros_ec_config "$@" ) + local config=$(cros_ec_config "$@") - local crossgcc_bin_prefix=$( project_action_arguments "prefix" "crossgcc" "$arch" ) + local crossgcc_bin_prefix=$(project_action_arguments "prefix" "crossgcc" "$arch") make -C "$sources_path" out="$build_path" CROSS_COMPILE="$crossgcc_bin_prefix" HOST_CROSS_COMPILE= BOARD="$config" -j$TASKS fi @@ -104,7 +104,7 @@ release() { local repository=$project - if [ "$target" = "tools" ] + if [[ "$target" = "tools" ]] then project_release_install_archive "$project" "$TOOLS" "$@" else @@ -119,7 +119,7 @@ release_check() { local repository=$project - if [ "$target" = "tools" ] + if [[ "$target" = "tools" ]] then project_release_install_archive_check "$project" "$TOOLS" "$@" else diff --git a/projects/cros-scripts/install/cros-boot-keys b/projects/cros-scripts/install/cros-boot-keys @@ -31,16 +31,16 @@ ALGORITHMS="7 7 11 7 7 4 11 11 11" MODES="7 7 11 7 10" usage() { - printf '%s\n' "$executable [action]" >&2 + printf 1>&2 '%s\n' "$executable [action]" - printf '\n%s\n' 'Actions:' >&2 - printf '%s\n' ' generate - Generate a set of keys' >&2 - printf '%s\n' ' verify - Verify keyblocks' >&2 + printf 1>&2 '\n%s\n' 'Actions:' + printf 1>&2 '%s\n' ' generate - Generate a set of keys' + printf 1>&2 '%s\n' ' verify - Verify keyblocks' - printf '\n%s\n' 'Environment variables:' >&2 - printf '%s\n' ' KEYS_VERSION - Version to give the keys' >&2 - printf '%s\n' ' VBOOT_KEYS_PATH - Path to the vboot keys' >&2 - printf '%s\n' ' VBOOT_TOOLS_PATH - Path to vboot tools' >&2 + printf 1>&2 '\n%s\n' 'Environment variables:' + printf 1>&2 '%s\n' ' KEYS_VERSION - Version to give the keys' + printf 1>&2 '%s\n' ' VBOOT_KEYS_PATH - Path to the vboot keys' + printf 1>&2 '%s\n' ' VBOOT_TOOLS_PATH - Path to vboot tools' } keys_override_confirm() { @@ -151,7 +151,7 @@ requirements() { if [ -z "$requirement_path" ] then - printf '%s\n' "Missing requirement: $requirement" >&2 + printf 1>&2 '%s\n' "Missing requirement: $requirement" exit 1 fi done diff --git a/projects/cros-scripts/install/cros-firmware-prepare b/projects/cros-scripts/install/cros-firmware-prepare @@ -22,34 +22,34 @@ VBPUBK="vbpubk" GBB_FLAGS="dev_screen_short_delay load_option_roms enable_alternate_os force_dev_switch_on force_dev_boot_usb disable_fw_rollback_check enter_triggers_tonorm force_dev_boot_legacy faft_key_overide disable_ec_software_sync default_dev_boot_lefacy disable_pd_software_sync disable_lid_shutdown dev_boot_fastboot_full_cap enable_serial" usage() { - printf '%s\n' "$executable [action] [firmware image] [gbb action|vpd action] [gbb file|gbb flag|vpd file]" >&2 + printf 1>&2 '%s\n' "$executable [action] [firmware image] [gbb action|vpd action] [gbb file|gbb flag|vpd file]" - printf '\n%s\n' 'Actions:' >&2 - printf '%s\n' ' sign - Sign firmware image' >&2 - printf '%s\n' ' verify - Verify firmware image' >&2 - printf '%s\n' ' gbb - Google Binary Block' >&2 + printf 1>&2 '\n%s\n' 'Actions:' + printf 1>&2 '%s\n' ' sign - Sign firmware image' + printf 1>&2 '%s\n' ' verify - Verify firmware image' + printf 1>&2 '%s\n' ' gbb - Google Binary Block' - printf '\n%s\n' 'GBB actions:' >&2 - printf '%s\n' ' extract - Extract GBB from firmware image to path' >&2 - printf '%s\n' ' replace - Replace GBB from path to firmware image' >&2 - printf '%s\n' ' list - List enabled GBB flags' >&2 - printf '%s\n' ' enable - Enable GBB flag' >&2 - printf '%s\n' ' disable - Disable GBB flag' >&2 + printf 1>&2 '\n%s\n' 'GBB actions:' + printf 1>&2 '%s\n' ' extract - Extract GBB from firmware image to path' + printf 1>&2 '%s\n' ' replace - Replace GBB from path to firmware image' + printf 1>&2 '%s\n' ' list - List enabled GBB flags' + printf 1>&2 '%s\n' ' enable - Enable GBB flag' + printf 1>&2 '%s\n' ' disable - Disable GBB flag' - printf '\n%s\n' 'GBB flags:' >&2 + printf 1>&2 '\n%s\n' 'GBB flags:' for flag in $GBB_FLAGS do - printf '%s\n' " $flag" >&2 + printf 1>&2 '%s\n' " $flag" done - printf '\n%s\n' 'VPD actions:' >&2 - printf '%s\n' ' extract - Extract VPD from firmware image to path' >&2 - printf '%s\n' ' replace - Replace VPD from path to firmware image' >&2 + printf 1>&2 '\n%s\n' 'VPD actions:' + printf 1>&2 '%s\n' ' extract - Extract VPD from firmware image to path' + printf 1>&2 '%s\n' ' replace - Replace VPD from path to firmware image' - printf '\n%s\n' 'Environment variables:' >&2 - printf '%s\n' ' VBOOT_KEYS_PATH - Path to the vboot keys' >&2 - printf '%s\n' ' VBOOT_TOOLS_PATH - Path to vboot tools' >&2 + printf 1>&2 '\n%s\n' 'Environment variables:' + printf 1>&2 '%s\n' ' VBOOT_KEYS_PATH - Path to the vboot keys' + printf 1>&2 '%s\n' ' VBOOT_TOOLS_PATH - Path to vboot tools' } sign() { @@ -134,7 +134,7 @@ gbb() { if [ -z "$flag_value" ] then - printf '%s\n' "Invalid GBB flag: $gbb_flag" >&2 + printf 1>&2 '%s\n' "Invalid GBB flag: $gbb_flag" exit 1 fi @@ -156,7 +156,7 @@ gbb() { if [ -z "$flag_value" ] then - printf '%s\n' "Invalid GBB flag: $gbb_flag" >&2 + printf 1>&2 '%s\n' "Invalid GBB flag: $gbb_flag" exit 1 fi @@ -237,7 +237,7 @@ requirements() { if [ -z "$requirement_path" ] then - printf '%s\n' "Missing requirement: $requirement" >&2 + printf 1>&2 '%s\n' "Missing requirement: $requirement" exit 1 fi done diff --git a/projects/cros-scripts/install/cros-kernel-install b/projects/cros-scripts/install/cros-kernel-install @@ -23,22 +23,22 @@ MODEL="model" NAME="name" usage() { - printf '%s\n' "$executable [action] [storage] [kernel image|kernel modules]" >&2 + printf 1>&2 '%s\n' "$executable [action] [storage] [kernel image|kernel modules]" - printf '\n%s\n' 'Actions:' >&2 - printf '%s\n' ' backup - Backup kernel image' >&2 - printf '%s\n' ' image - Install kernel image' >&2 - printf '%s\n' ' modules - Install kernel modules' >&2 + printf 1>&2 '\n%s\n' 'Actions:' + printf 1>&2 '%s\n' ' backup - Backup kernel image' + printf 1>&2 '%s\n' ' image - Install kernel image' + printf 1>&2 '%s\n' ' modules - Install kernel modules' usage_storage - printf '\n%s\n' 'Environment variables:' >&2 - printf '%s\n' ' VBOOT_KEYS_PATH - Path to the vboot keys' >&2 - printf '%s\n' ' VBOOT_TOOLS_PATH - Path to vboot tools' >&2 + printf 1>&2 '\n%s\n' 'Environment variables:' + printf 1>&2 '%s\n' ' VBOOT_KEYS_PATH - Path to the vboot keys' + printf 1>&2 '%s\n' ' VBOOT_TOOLS_PATH - Path to vboot tools' } usage_storage() { - printf '\n%s\n' 'Storage:' >&2 + printf 1>&2 '\n%s\n' 'Storage:' local nodes=$( ls "$SYS_BLOCK_PATH" ) local node_path @@ -58,7 +58,7 @@ usage_storage() { continue fi - printf '%s\n' " $node_path - $name" >&2 + printf 1>&2 '%s\n' " $node_path - $name" done } @@ -155,7 +155,7 @@ backup() { if [ -z "$storage_kernel_path" ] then - printf '%s\n' "No kernel partition found on storage $storage_path" >&2 + printf 1>&2 '%s\n' "No kernel partition found on storage $storage_path" return 1 fi @@ -172,7 +172,7 @@ image() { if [ -z "$storage_kernel_path" ] then - printf '%s\n' "No kernel partition found on storage $storage_path" >&2 + printf 1>&2 '%s\n' "No kernel partition found on storage $storage_path" return 1 fi @@ -192,7 +192,7 @@ modules() { if [ -z "$storage_rootfs_path" ] then - printf '%s\n' "No rootfs partition found on storage $storage_path" >&2 + printf 1>&2 '%s\n' "No rootfs partition found on storage $storage_path" return 1 fi @@ -221,7 +221,7 @@ requirements() { if [ -z "$requirement_path" ] then - printf '%s\n' "Missing requirement: $requirement" >&2 + printf 1>&2 '%s\n' "Missing requirement: $requirement" exit 1 fi done diff --git a/projects/cros-scripts/install/cros-kernel-prepare b/projects/cros-scripts/install/cros-kernel-prepare @@ -27,21 +27,21 @@ FIT="fit" IMG="img" usage() { - printf '%s\n' "$executable [action] [kernel files|kernel image] [medium]" >&2 + printf 1>&2 '%s\n' "$executable [action] [kernel files|kernel image] [medium]" - printf '\n%s\n' 'Actions:' >&2 - printf '%s\n' ' pack - Pack kernel files to a medium-specific image' >&2 - printf '%s\n' ' sign - Sign kernel image' >&2 - printf '%s\n' ' verify - Very kernel image signatures' >&2 + printf 1>&2 '\n%s\n' 'Actions:' + printf 1>&2 '%s\n' ' pack - Pack kernel files to a medium-specific image' + printf 1>&2 '%s\n' ' sign - Sign kernel image' + printf 1>&2 '%s\n' ' verify - Very kernel image signatures' - printf '\n%s\n' 'Medium:' >&2 - printf '%s\n' ' usb - External USB storage' >&2 - printf '%s\n' ' mmc - External SD card storage' >&2 - printf '%s\n' ' emmc - Internal storage' >&2 + printf 1>&2 '\n%s\n' 'Medium:' + printf 1>&2 '%s\n' ' usb - External USB storage' + printf 1>&2 '%s\n' ' mmc - External SD card storage' + printf 1>&2 '%s\n' ' emmc - Internal storage' - printf '\n%s\n' 'Environment variables:' >&2 - printf '%s\n' ' VBOOT_KEYS_PATH - Path to the vboot keys' >&2 - printf '%s\n' ' VBOOT_TOOLS_PATH - Path to vboot tools' >&2 + printf 1>&2 '\n%s\n' 'Environment variables:' + printf 1>&2 '%s\n' ' VBOOT_KEYS_PATH - Path to the vboot keys' + printf 1>&2 '%s\n' ' VBOOT_TOOLS_PATH - Path to vboot tools' } pack() { @@ -88,7 +88,7 @@ requirements() { if [ -z "$requirement_path" ] then - printf '%s\n' "Missing requirement: $requirement" >&2 + printf 1>&2 '%s\n' "Missing requirement: $requirement" exit 1 fi done diff --git a/projects/cros-scripts/install/cros-medium-setup b/projects/cros-scripts/install/cros-medium-setup @@ -32,22 +32,22 @@ GPT_SIZE=34 KERNEL_SIZE=16384 usage() { - printf '%s\n' "$executable [action] [storage] [rootfs tarball|kernel files] [medium]" >&2 + printf 1>&2 '%s\n' "$executable [action] [storage] [rootfs tarball|kernel files] [medium]" - printf '\n%s\n' 'Actions:' >&2 - printf '%s\n' ' partitions - Setup partitions on storage' >&2 - printf '%s\n' ' rootfs - Install rootfs tarball to storage' >&2 - printf '%s\n' ' kernel - Install kernel files to storage' >&2 + printf 1>&2 '\n%s\n' 'Actions:' + printf 1>&2 '%s\n' ' partitions - Setup partitions on storage' + printf 1>&2 '%s\n' ' rootfs - Install rootfs tarball to storage' + printf 1>&2 '%s\n' ' kernel - Install kernel files to storage' usage_storage - printf '\n%s\n' 'Environment variables:' >&2 - printf '%s\n' ' KERNEL_PATH - Path to the kernel image' >&2 - printf '%s\n' ' VBOOT_TOOLS_PATH - Path to vboot tools' >&2 + printf 1>&2 '\n%s\n' 'Environment variables:' + printf 1>&2 '%s\n' ' KERNEL_PATH - Path to the kernel image' + printf 1>&2 '%s\n' ' VBOOT_TOOLS_PATH - Path to vboot tools' } usage_storage() { - printf '\n%s\n' 'Storage:' >&2 + printf 1>&2 '\n%s\n' 'Storage:' local nodes=$( ls "$SYS_BLOCK_PATH" ) local node_path @@ -67,7 +67,7 @@ usage_storage() { continue fi - printf '%s\n' " $node_path - $name" >&2 + printf 1>&2 '%s\n' " $node_path - $name" done } @@ -243,7 +243,7 @@ requirements() { if [ -z "$requirement_path" ] then - printf '%s\n' "Missing requirement: $requirement" >&2 + printf 1>&2 '%s\n' "Missing requirement: $requirement" exit 1 fi done diff --git a/projects/crossgcc/crossgcc b/projects/crossgcc/crossgcc @@ -46,11 +46,11 @@ extract() { crossgcc_tarballs "$@" | while read tarball do - local tarball_sources_path=$( crossgcc_tarball_sources_path "$tarball" ) - local tarball_install_path=$( crossgcc_tarball_install_path "$tarball" "$@" ) - local tarball_install_directory_path=$( dirname "$tarball_install_path" ) + local tarball_sources_path=$(crossgcc_tarball_sources_path "$tarball") + local tarball_install_path=$(crossgcc_tarball_install_path "$tarball" "$@") + local tarball_install_directory_path=$(dirname "$tarball_install_path") - if [ -f "$tarball_sources_path" ] && ! [ -f "$tarball_install_path" ] + if [[ -f "$tarball_sources_path" ]] && ! [[ -f "$tarball_install_path" ]] then printf '%s\n' "Copying source archive $tarball for $project (with ${arguments:-no argument})" @@ -70,7 +70,7 @@ extract_check() { crossgcc_tarballs "$@" | while read tarball do - local tarball_install_path=$( crossgcc_tarball_install_path "$tarball" "$@" ) + local tarball_install_path=$(crossgcc_tarball_install_path "$tarball" "$@") test ! -f "$tarball_install_path" done @@ -86,11 +86,11 @@ update() { crossgcc_tarballs "$@" | while read tarball do - local tarball_sources_path=$( crossgcc_tarball_sources_path "$tarball" ) - local tarball_install_path=$( crossgcc_tarball_install_path "$tarball" "$@" ) - local tarball_install_directory_path=$( dirname "$tarball_install_path" ) + local tarball_sources_path=$(crossgcc_tarball_sources_path "$tarball") + local tarball_install_path=$(crossgcc_tarball_install_path "$tarball" "$@") + local tarball_install_directory_path=$(dirname "$tarball_install_path") - if [ -f $tarball_sources_path ] + if [[ -f $tarball_sources_path ]] then printf '%s\n' "Copying source archive $tarball for $project (with ${arguments:-no argument})" @@ -110,7 +110,7 @@ update_check() { crossgcc_tarballs "$@" | while read tarball do - local tarball_sources_path=$( crossgcc_tarball_sources_path "$tarball" "$@" ) + local tarball_sources_path=$(crossgcc_tarball_sources_path "$tarball" "$@") test ! -f "$tarball_sources_path" done @@ -119,7 +119,7 @@ update_check() { prefix() { local arch=$1 - local build_path=$( project_build_path "$project" "$@" ) + local build_path=$(project_build_path "$project" "$@") case $arch in "arm") @@ -138,8 +138,8 @@ build() { project_sources_directory_missing_empty_error "$project" "$repository" "$@" - local sources_path=$( project_sources_path "$project" "$repository" "$@" ) - local build_path=$( project_build_path "$project" "$@" ) + local sources_path=$(project_sources_path "$project" "$repository" "$@") + local build_path=$(project_build_path "$project" "$@") if git_project_check "$repository" then @@ -184,13 +184,13 @@ release() { crossgcc_tarballs "$@" | while read tarball do - local tarball_install_path=$( crossgcc_tarball_install_path "$tarball" "$@" ) - local tarball_release_path=$( crossgcc_tarball_release_path "$tarball" "$@" ) - local release_path=$( project_release_path "$project" "$SOURCES" "$@" ) + local tarball_install_path=$(crossgcc_tarball_install_path "$tarball" "$@") + local tarball_release_path=$(crossgcc_tarball_release_path "$tarball" "$@") + local release_path=$(project_release_path "$project" "$SOURCES" "$@") mkdir -p "$release_path" - if [ -f "$tarball_install_path" ] && ! [ -f "$tarball_release_path" ] + if [[ -f "$tarball_install_path" ]] && ! [[ -f "$tarball_release_path" ]] then printf '%s\n' "Releasing source archive $tarball for $project (with ${arguments:-no argument})" @@ -210,7 +210,7 @@ release_check() { crossgcc_tarballs "$@" | while read tarball do - local tarball_release_path=$( crossgcc_tarball_release_path "$tarball" "$@" ) + local tarball_release_path=$(crossgcc_tarball_release_path "$tarball" "$@") test -f "$tarball_release_path" done diff --git a/projects/crossgcc/crossgcc-helper b/projects/crossgcc/crossgcc-helper @@ -31,9 +31,9 @@ crossgcc_same_major_version_test() { } crossgcc_tarballs() { - local sources_path=$( project_sources_path "$project" "$repository" "$@" ) + local sources_path=$(project_sources_path "$project" "$repository" "$@") local install_path="$sources_path/util/crossgcc/tarballs/" - local tarballs=$( ls "$sources_path/util/crossgcc/sum" | sed "s/.cksum$//" ) + local tarballs=$(ls "$sources_path/util/crossgcc/sum" | sed "s/.cksum$//") printf '%s\n' "$tarballs" } @@ -50,7 +50,7 @@ crossgcc_tarball_install_path() { local tarball=$1 shift - local sources_path=$( project_sources_path "$project" "$repository" "$@" ) + local sources_path=$(project_sources_path "$project" "$repository" "$@") local install_path="$sources_path/util/crossgcc/tarballs/" local tarball_install_path="$install_path/$tarball" @@ -61,7 +61,7 @@ crossgcc_tarball_release_path() { local tarball=$1 shift - local release_path=$( project_release_path "$project" "$SOURCES" "$@" ) + local release_path=$(project_release_path "$project" "$SOURCES" "$@") local tarball_release_path="$release_path/$tarball" printf '%s\n' "$tarball_release_path" diff --git a/projects/depthcharge/depthcharge b/projects/depthcharge/depthcharge @@ -66,15 +66,15 @@ build() { git_project_checkout "$project" "$repository" "$@" fi - local sources_path=$( project_sources_path "$project" "$repository" "$@" ) - local build_path=$( project_build_path "$project" "$@" ) + local sources_path=$(project_sources_path "$project" "$repository" "$@") + local build_path=$(project_build_path "$project" "$@") - local libpayload_build_path=$( project_build_path "libpayload" "$project" "$@" ) + local libpayload_build_path=$(project_build_path "libpayload" "$project" "$@") local libpayload_build_install_path="$libpayload_build_path/install" - local vboot_sources_path=$( project_sources_path "vboot" "vboot" "devices" ) + local vboot_sources_path=$(project_sources_path "vboot" "vboot" "devices") - local arch=$( depthcharge_arch "$@" ) - local device=$( depthcharge_device "$@" ) + local arch=$(depthcharge_arch "$@") + local device=$(depthcharge_device "$@") project_action_arguments "checkout" "vboot" "devices" diff --git a/projects/flashmap/flashmap b/projects/flashmap/flashmap @@ -56,8 +56,8 @@ build() { project_sources_directory_missing_empty_error "$project" "$repository" "$@" - local sources_path=$( project_sources_path "$project" "$repository" "$@" ) - local build_path=$( project_build_path "$project" "$@" ) + local sources_path=$(project_sources_path "$project" "$repository" "$@") + local build_path=$(project_build_path "$project" "$@") if git_project_check "$repository" then diff --git a/projects/flashrom-cros/flashrom-cros b/projects/flashrom-cros/flashrom-cros @@ -61,8 +61,8 @@ build() { git_project_checkout "$project" "$repository" "$@" fi - local sources_path=$( project_sources_path "$project" "$repository" "$@" ) - local build_path=$( project_build_path "$project" "$@" ) + local sources_path=$(project_sources_path "$project" "$repository" "$@") + local build_path=$(project_build_path "$project" "$@") mkdir -p "$build_path" diff --git a/projects/flashrom/flashrom b/projects/flashrom/flashrom @@ -70,8 +70,8 @@ build() { git_project_checkout "$project" "$repository" "$@" fi - local sources_path=$( project_sources_path "$project" "$repository" "$@" ) - local build_path=$( project_build_path "$project" "$@" ) + local sources_path=$(project_sources_path "$project" "$repository" "$@") + local build_path=$(project_build_path "$project" "$@") mkdir -p "$build_path" diff --git a/projects/hdctools/hdctools b/projects/hdctools/hdctools @@ -58,8 +58,8 @@ build() { project_sources_directory_missing_empty_error "$project" "$repository" "$@" - local sources_path=$( project_sources_path "$project" "$repository" "$@" ) - local build_path=$( project_build_path "$project" "$@" ) + local sources_path=$(project_sources_path "$project" "$repository" "$@") + local build_path=$(project_build_path "$project" "$@") if git_project_check "$repository" then diff --git a/projects/libpayload/libpayload b/projects/libpayload/libpayload @@ -34,17 +34,17 @@ build() { git_project_checkout "$repository" "$repository" "$@" fi - local coreboot_sources_path=$( project_sources_path "$repository" "$repository" "$@" ) + local coreboot_sources_path=$(project_sources_path "$repository" "$repository" "$@") local sources_path="$coreboot_sources_path/payloads/libpayload/" - local build_path=$( project_build_path "$project" "$@" ) + local build_path=$(project_build_path "$project" "$@") local build_install_path="$build_path/install" - local config_name=$( libpayload_config "$@" ) + local config_name=$(libpayload_config "$@") local config_path="$sources_path/configs/$config_name" - local arch=$( libpayload_arch "$@" ) + local arch=$(libpayload_arch "$@") - local crossgcc_build_path=$( project_build_path "crossgcc" "$arch" ) + local crossgcc_build_path=$(project_build_path "crossgcc" "$arch") local crossgcc_bin_path="$crossgcc_build_path/bin/" rm -f "$sources_path/.xcompile" diff --git a/projects/libreboot-release/install/libreboot-release b/projects/libreboot-release/install/libreboot-release @@ -27,18 +27,18 @@ CHECKSUM="sha256sum" ASC="asc" usage() { - printf '%s\n' "$executable [action] [projects...]" >&2 - - printf '\n%s\n' 'Actions:' >&2 - printf '%s\n' ' download - Download project files' >&2 - printf '%s\n' ' sources - Download project sources' >&2 - printf '%s\n' ' verify - Verify project files' >&2 - printf '%s\n' ' extract - Extract project files' >&2 - printf '%s\n' ' prepare - Download, verify and extract project files' >&2 - - printf '\n%s\n' 'Environment variables:' >&2 - printf '%s\n' ' MACHINE - Machine architecture to use' >&2 - printf '%s\n' ' DOWNLOAD_URL - Base URL to download files from' >&2 + printf 1>&2 '%s\n' "$executable [action] [projects...]" + + printf 1>&2 '\n%s\n' 'Actions:' + printf 1>&2 '%s\n' ' download - Download project files' + printf 1>&2 '%s\n' ' sources - Download project sources' + printf 1>&2 '%s\n' ' verify - Verify project files' + printf 1>&2 '%s\n' ' extract - Extract project files' + printf 1>&2 '%s\n' ' prepare - Download, verify and extract project files' + + printf 1>&2 '\n%s\n' 'Environment variables:' + printf 1>&2 '%s\n' ' MACHINE - Machine architecture to use' + printf 1>&2 '%s\n' ' DOWNLOAD_URL - Base URL to download files from' } download() { @@ -85,7 +85,7 @@ download() { IFS=$ifs_save done - printf '%s\n' "Could not download $project from $DOWNLOAD_URL" >&2 + printf 1>&2 '%s\n' "Could not download $project from $DOWNLOAD_URL" return 1 } @@ -104,7 +104,7 @@ sources() { printf '\n%s\n' "Downloaded $project sources" else - printf '%s\n' "Could not download $project sources from $DOWNLOAD_URL" >&2 + printf 1>&2 '%s\n' "Could not download $project sources from $DOWNLOAD_URL" return 1 fi @@ -153,14 +153,14 @@ verify() { sha256sum -c "$project.$ARCHIVE.$CHECKSUM" ) else - printf '%s\n' "Could not verify $project checksum!" >&2 + printf 1>&2 '%s\n' "Could not verify $project checksum!" fi if [ -f "$signature_path" ] then gpg --armor --verify "$signature_path" "$path" else - printf '%s\n' "Could not verify $project signature!" >&2 + printf 1>&2 '%s\n' "Could not verify $project signature!" fi printf '\n%s\n' "Verified $project" @@ -171,7 +171,7 @@ verify() { IFS=$ifs_save done - printf '%s\n' "Could not verify $project" >&2 + printf 1>&2 '%s\n' "Could not verify $project" return 1 } @@ -225,7 +225,7 @@ extract() { IFS=$ifs_save done - printf '%s\n' "Could not extract $project" >&2 + printf 1>&2 '%s\n' "Could not extract $project" return 1 } @@ -239,7 +239,7 @@ requirements() { if [ -z "$requirement_path" ] then - printf '%s\n' "Missing requirement: $requirement" >&2 + printf 1>&2 '%s\n' "Missing requirement: $requirement" exit 1 fi done @@ -256,7 +256,7 @@ setup() { if [ -z "$DOWNLOAD_URL" ] then - printf '%s\n' 'Missing download URL' >&2 + printf 1>&2 '%s\n' 'Missing download URL' exit 1 fi } diff --git a/projects/libreboot-release/libreboot-release b/projects/libreboot-release/libreboot-release @@ -16,7 +16,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. install() { - local install_path=$( project_install_path "$project" "$@" ) + local install_path=$(project_install_path "$project" "$@") project_install "$project" "$@" } diff --git a/projects/libreboot-sources/install/libreboot-sources b/projects/libreboot-sources/install/libreboot-sources @@ -21,12 +21,12 @@ SOURCES="sources" ARCHIVE="tar.xz" usage() { - printf '%s\n' "$executable [action] [sources path] (extract path)" >&2 + printf 1>&2 '%s\n' "$executable [action] [sources path] (extract path)" - printf '\n%s\n' 'Actions:' >&2 - printf '%s\n' ' extract - Extract build system sources' >&2 - printf '%s\n' ' copy - Copy projects sources' >&2 - printf '%s\n' ' prepare - Extract and copy sources' >&2 + printf 1>&2 '\n%s\n' 'Actions:' + printf 1>&2 '%s\n' ' extract - Extract build system sources' + printf 1>&2 '%s\n' ' copy - Copy projects sources' + printf 1>&2 '%s\n' ' prepare - Extract and copy sources' printf '\n%s\n' ' When no extract path is provided, sources are extracted in the current' printf '%s\n' ' directory.' @@ -49,7 +49,7 @@ extract() { archive=$( find $sources_path -name "$BUILD_SYSTEM-sources.$ARCHIVE" || true ) if [ -z "$archive" ] then - printf '%s\n' "Finding $BUILD_SYSTEM sources archive failed!" >&2 + printf 1>&2 '%s\n' "Finding $BUILD_SYSTEM sources archive failed!" usage exit 1 fi @@ -96,7 +96,7 @@ requirements() { if [ -z "$requirement_path" ] then - printf '%s\n' "Missing requirement: $requirement" >&2 + printf 1>&2 '%s\n' "Missing requirement: $requirement" exit 1 fi done diff --git a/projects/libreboot-sources/libreboot-sources b/projects/libreboot-sources/libreboot-sources @@ -23,7 +23,7 @@ update() { } install() { - local install_path=$( project_install_path "$project" "$@" ) + local install_path=$(project_install_path "$project" "$@") project_install "$project" "$@" } @@ -33,7 +33,7 @@ install_check() { } release() { - local archive_path=$( project_release_archive_path "$project" "$SOURCES" "$@" ) + local archive_path=$(project_release_archive_path "$project" "$SOURCES" "$@") local sources_path=$root project_release_install "$project" "$TOOLS" "$@" @@ -51,7 +51,7 @@ release() { } release_check() { - local archive_path=$( project_release_archive_path "$project" "$SOURCES" "$@" ) + local archive_path=$(project_release_archive_path "$project" "$SOURCES" "$@") project_release_install_check "$project" "$TOOLS" "$@" diff --git a/projects/mosys/mosys b/projects/mosys/mosys @@ -56,10 +56,10 @@ build() { project_sources_directory_missing_empty_error "$project" "$repository" "$@" - local sources_path=$( project_sources_path "$project" "$repository" "$@" ) - local build_path=$( project_build_path "$project" "$@" ) + local sources_path=$(project_sources_path "$project" "$repository" "$@") + local build_path=$(project_build_path "$project" "$@") - local flashmap_build_path=$( project_build_path "flashmap" "$@" ) + local flashmap_build_path=$(project_build_path "flashmap" "$@") if git_project_check "$repository" then diff --git a/projects/nvramtool/nvramtool b/projects/nvramtool/nvramtool @@ -56,9 +56,9 @@ build() { project_sources_directory_missing_empty_error "$project" "$repository" "$@" - local coreboot_sources_path=$( project_sources_path "$project" "$repository" "$@" ) + local coreboot_sources_path=$(project_sources_path "$project" "$repository" "$@") local sources_path="$coreboot_sources_path/util/nvramtool/" - local build_path=$( project_build_path "$project" "$@" ) + local build_path=$(project_build_path "$project" "$@") if git_project_check "$repository" then diff --git a/projects/vboot/vboot b/projects/vboot/vboot @@ -75,10 +75,10 @@ build() { git_project_checkout "$project" "$repository" "$@" fi - if [ "$target" = "tools" ] + if [[ "$target" = "tools" ]] then - local sources_path=$( project_sources_path "$project" "$repository" "$@" ) - local build_path=$( project_build_path "$project" "$@" ) + local sources_path=$(project_sources_path "$project" "$repository" "$@") + local build_path=$(project_build_path "$project" "$@") mkdir -p "$build_path" @@ -92,7 +92,7 @@ build() { build_check() { local target=$1 - if [ "$target" = "tools" ] + if [[ "$target" = "tools" ]] then project_build_check "$project" "$@" fi @@ -101,7 +101,7 @@ build_check() { install() { local target=$1 - if [ "$target" = "tools" ] + if [[ "$target" = "tools" ]] then project_install "$project" "$@" fi @@ -110,7 +110,7 @@ install() { install_check() { local target=$1 - if [ "$target" = "tools" ] + if [[ "$target" = "tools" ]] then project_install_check "$project" "$@" fi @@ -121,7 +121,7 @@ release() { local repository=$project - if [ "$target" = "tools" ] + if [[ "$target" = "tools" ]] then project_release_install_archive "$project" "$TOOLS" "$@" fi @@ -134,7 +134,7 @@ release_check() { local repository=$project - if [ "$target" = "tools" ] + if [[ "$target" = "tools" ]] then project_release_install_archive_check "$project" "$TOOLS" "$@" fi diff --git a/projects/vpd/vpd b/projects/vpd/vpd @@ -56,8 +56,8 @@ build() { project_sources_directory_missing_empty_error "$project" "$repository" "$@" - local sources_path=$( project_sources_path "$project" "$repository" "$@" ) - local build_path=$( project_build_path "$project" "$@" ) + local sources_path=$(project_sources_path "$project" "$repository" "$@") + local build_path=$(project_build_path "$project" "$@") if git_project_check "$repository" then diff --git a/tools/blobs-discover/blobs-discover b/tools/blobs-discover/blobs-discover @@ -18,7 +18,7 @@ arguments() { local project=$1 - if [ -z "$project" ] + if [[ -z "$project" ]] then ls -A "$root/$PROJECTS/" | while read project do @@ -36,8 +36,8 @@ usage() { } update() { - local tool_path=$( tool_path "$tool" ) - local sources_path=$( tool_sources_path "$tool" ) + local tool_path=$(tool_path "$tool") + local sources_path=$(tool_sources_path "$tool") local deblob_check_path="$sources_path/deblob-check" local patches_path="$tool_path/$PATCHES/$WILDDOTPATCH" @@ -50,7 +50,7 @@ update() { path_wildcard_expand "$patches_path" | while read patch_path do - if ! [ -f "$patch_path" ] + if ! [[ -f "$patch_path" ]] then continue fi @@ -63,10 +63,10 @@ verify() { local project=$1 shift - local project_path=$( project_path "$project" ) - local project_sources_path=$( project_sources_path "$project" "$repository" "$@" ) - local project_blobs_path=$( project_blobs_path "$project" "$@" ) - local project_blobs_ignore_path=$( project_blobs_ignore_path "$project" "$@" ) + local project_path=$(project_path "$project") + local project_sources_path=$(project_sources_path "$project" "$repository" "$@") + local project_blobs_path=$(project_blobs_path "$project" "$@") + local project_blobs_ignore_path=$(project_blobs_ignore_path "$project" "$@") local project_blobs_discover_path local ifs_save @@ -75,9 +75,9 @@ verify() { requirements "sort" - if ! [ -z "$project_blobs_path" ] + if [[ -n "$project_blobs_path" ]] then - project_blobs_discover_path="$( dirname $project_blobs_path )/$BLOBS_DISCOVER" + project_blobs_discover_path="$(dirname $project_blobs_path)/$BLOBS_DISCOVER" else project_blobs_discover_path="$project_path/$CONFIGS/$BLOBS_DISCOVER" fi @@ -88,7 +88,7 @@ verify() { ifs_save=$IFS IFS=$'\n' - for file in $( cat "$project_blobs_discover_path" ) + for file in $(cat "$project_blobs_discover_path") do ( IFS=$ifs_save @@ -100,7 +100,7 @@ verify() { printf '%s' "Type \"blob\" to keep or press enter to discard: " read choice - if [ "$choice" = "blob" ] + if [[ "$choice" = "blob" ]] then printf '%s\n' "$file" >> "$project_blobs_path" else @@ -124,21 +124,21 @@ execute() { shift local repository=$project - local repository_path=$( git_project_repository_path "$repository" ) + local repository_path=$(git_project_repository_path "$repository") # This assumes that the repository is the project, which is not always the case. project_sources_directory_missing_empty_error "$project" "$repository" - local sources_path=$( tool_sources_path "$tool" ) - local project_path=$( project_path "$project" ) - local project_sources_path=$( project_sources_path "$project" "$repository" "$@" ) - local project_blobs_path=$( project_blobs_path "$project" "$@" ) - local project_blobs_ignore_path=$( project_blobs_ignore_path "$project" "$@" ) + local sources_path=$(tool_sources_path "$tool") + local project_path=$(project_path "$project") + local project_sources_path=$(project_sources_path "$project" "$repository" "$@") + local project_blobs_path=$(project_blobs_path "$project" "$@") + local project_blobs_ignore_path=$(project_blobs_ignore_path "$project" "$@") local project_blobs_directory_path - if ! [ -z "$project_blobs_path" ] + if [[ -n "$project_blobs_path" ]] then - project_blobs_discover_path="$( dirname $project_blobs_path )/$BLOBS_DISCOVER" + project_blobs_discover_path="$(dirname $project_blobs_path)/$BLOBS_DISCOVER" else project_blobs_discover_path="$project_path/$CONFIGS/$BLOBS_DISCOVER" fi @@ -153,23 +153,23 @@ execute() { printf '\n%s\n' 'Discovering new blobs, this may take a while...' - files=$( find "$project_sources_path" -type f | grep -vP "\.git/|\.tar|\.patch" ) + files=$(find "$project_sources_path" -type f | grep -vP "\.git/|\.tar|\.patch") touch "$project_blobs_discover_path" printf '%s\n' "$files" | while read file do - if ! [ -z "$project_blobs_ignore_path" ] + if [[ -n "$project_blobs_ignore_path" ]] then match=$( grep "$file" "$project_blobs_ignore_path" || true) - if [ ! -z "$match" ] + if [[ ! -z "$match" ]] then continue fi fi - match=$( "$deblob_check_path" -l -i "" "$file" || true ) - if ! [ -z "$match" ] + match=$("$deblob_check_path" -l -i "" "$file" || true) + if [[ -n "$match" ]] then printf '%s\n' "$match" >> "$project_blobs_discover_path" fi @@ -182,14 +182,14 @@ execute_check() { local project=$1 shift - local project_path=$( project_path "$project" ) - local project_blobs_path=$( project_blobs_path "$project" "$@" ) - local project_blobs_ignore_path=$( project_blobs_ignore_path "$project" "$@" ) + local project_path=$(project_path "$project") + local project_blobs_path=$(project_blobs_path "$project" "$@") + local project_blobs_ignore_path=$(project_blobs_ignore_path "$project" "$@") local project_blobs_discover_path - if ! [ -z "$project_blobs_path" ] + if [[ -n "$project_blobs_path" ]] then - project_blobs_discover_path="$( dirname $project_blobs_path )/$BLOBS_DISCOVER" + project_blobs_discover_path="$(dirname $project_blobs_path)/$BLOBS_DISCOVER" else project_blobs_discover_path="$project_path/$CONFIGS/$BLOBS_DISCOVER" fi diff --git a/tools/boot-keys/boot-keys b/tools/boot-keys/boot-keys @@ -20,11 +20,11 @@ usage() { } generate() { - local type=$( boot_keys_type "$@" ) + local type=$(boot_keys_type "$@") - if [ -z "$type" ] + if [[ -z "$type" ]] then - printf '%s\n' 'Unable to determine keys type' >&2 + printf 1>&2 '%s\n' 'Unable to determine keys type' return 1 fi @@ -38,16 +38,16 @@ generate() { sign() { local project=$1 - local prepare_files=$( boot_keys_files "$@" ) - local type=$( boot_keys_type "$@" ) + local prepare_files=$(boot_keys_files "$@") + local type=$(boot_keys_type "$@") local install_path local firmware_path local kernel_path local media - if [ -z "$type" ] + if [[ -z "$type" ]] then - printf '%s\n' 'Unable to determine keys type' >&2 + printf 1>&2 '%s\n' 'Unable to determine keys type' return 1 fi @@ -60,13 +60,13 @@ sign() { boot_keys_cros "$type-prepare" "sign" "$firmware_path" ;; "cros-kernel") - media=$( project_action "media" "$@" ) + media=$(project_action "media" "$@") for medium in $media do kernel_path="$install_path/$KERNEL-$medium.$IMG" - if [ -f "$kernel_path" ] + if [[ -f "$kernel_path" ]] then boot_keys_cros "$type-prepare" "sign" "$kernel_path" else @@ -81,16 +81,16 @@ sign() { verify() { local project=$1 - local prepare_files=$( boot_keys_files "$@" ) - local type=$( boot_keys_type "$@" ) + local prepare_files=$(boot_keys_files "$@") + local type=$(boot_keys_type "$@") local install_path local firmware_path local kernel_path local media - if [ -z "$type" ] + if [[ -z "$type" ]] then - printf '%s\n' 'Unable to determine keys type' >&2 + printf 1>&2 '%s\n' 'Unable to determine keys type' return 1 fi @@ -103,7 +103,7 @@ verify() { boot_keys_cros "$type-prepare" "verify" "$firmware_path" ;; "cros-kernel") - media=$( project_action "media" "$@" ) + media=$(project_action "media" "$@") for medium in $media do diff --git a/tools/boot-keys/boot-keys-helper b/tools/boot-keys/boot-keys-helper @@ -9,13 +9,13 @@ boot_keys_cros() { local cros_script=$1 shift - local vboot_tools_path=$( project_install_path "vboot" "tools" ) - local cros_scripts_path=$( project_install_path "cros-scripts" ) + local vboot_tools_path=$(project_install_path "vboot" "tools") + local cros_scripts_path=$(project_install_path "cros-scripts") local cros_script_path="$cros_scripts_path/$cros_script" - if ! [ -x "$cros_script_path" ] + if ! [[ -x "$cros_script_path" ]] then - printf '%s' "$cros_script script missing from cros-scripts install" >&2 + printf 1>&2 '%s' "$cros_script script missing from cros-scripts install" return 1 fi @@ -34,10 +34,10 @@ boot_keys_files_install_path() { local argument local ifs_save - helper_arguments=$( project_action_helper "arguments" "$project" "$@" ) + helper_arguments=$(project_action_helper "arguments" "$project" "$@") - if [ $? -ne 0 ] || [ -z "$helper_arguments" ] + if [[ $? -ne 0 ]] || [[ -z "$helper_arguments" ]] then project_install_path "$project" "$@" else @@ -45,7 +45,7 @@ boot_keys_files_install_path() { ifs_save=$IFS IFS=$'\n' - for argument in $( printf '%s\n' "$helper_arguments" ) + for argument in $(printf '%s\n' "$helper_arguments") do ( IFS=$ifs_save @@ -63,7 +63,7 @@ boot_keys_files() { local project=$1 shift - local cros_scripts_path=$( project_install_path "cros-scripts" ) + local cros_scripts_path=$(project_install_path "cros-scripts") local cros_boot_keys="$cros_scripts_path/cros-boot-keys" project_action_arguments_verify_recursive "install" "$project" "$@"