From 5c1fe562d8044249f5830df826544bc72ecb41b2 Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Thu, 26 Oct 2017 21:45:42 -0400 Subject: Remove unnecessary spaces in command substitutions This is likely one of the very last changes necessary to make the Libreboot build system more cohesive in appearance. Hopefully from this point forward it won't be as readily apparent as to who wrote which parts of the build system (i.e. won't look like a patchwork quilt any longer). --- projects/cbfstool/cbfstool | 8 ++++---- projects/cbmem/cbmem | 4 ++-- projects/coreboot/coreboot | 12 +++++------ projects/cros-ec/cros-ec | 8 ++++---- projects/crossgcc/crossgcc | 30 ++++++++++++++-------------- 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/libreboot-release | 2 +- projects/libreboot-sources/libreboot-sources | 6 +++--- projects/mosys/mosys | 6 +++--- projects/nvramtool/nvramtool | 4 ++-- projects/vboot/vboot | 4 ++-- projects/vpd/vpd | 4 ++-- 18 files changed, 67 insertions(+), 67 deletions(-) (limited to 'projects') diff --git a/projects/cbfstool/cbfstool b/projects/cbfstool/cbfstool index eafe2ba9..c665bdca 100755 --- 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 index 6a469f61..3e240529 100755 --- 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 index f577ca26..85c1719d 100755 --- 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 index be7aa62b..ba03bd56 100755 --- 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 @@ -79,9 +79,9 @@ build() { 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 diff --git a/projects/crossgcc/crossgcc b/projects/crossgcc/crossgcc index 92a46860..46b9e3f3 100755 --- a/projects/crossgcc/crossgcc +++ b/projects/crossgcc/crossgcc @@ -46,9 +46,9 @@ 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" ]] then @@ -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,9 +86,9 @@ 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 ]] then @@ -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,9 +184,9 @@ 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" @@ -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 index 3891a15c..94e445bf 100755 --- 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 index fe64c7d9..966b9689 100755 --- 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 index 4ac6ab70..cc1cb81b 100755 --- 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 index 8e793fa7..a1259c2c 100755 --- 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 index 0206e6b7..bc3199f0 100755 --- 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 index 9a7abdf0..e30b1f7a 100755 --- 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 index 06c239dd..4fb90eb1 100755 --- 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/libreboot-release b/projects/libreboot-release/libreboot-release index d693f503..ed9604e1 100755 --- a/projects/libreboot-release/libreboot-release +++ b/projects/libreboot-release/libreboot-release @@ -16,7 +16,7 @@ # along with this program. If not, see . install() { - local install_path=$( project_install_path "$project" "$@" ) + local install_path=$(project_install_path "$project" "$@") project_install "$project" "$@" } diff --git a/projects/libreboot-sources/libreboot-sources b/projects/libreboot-sources/libreboot-sources index 3dc1cb7d..bbf42315 100755 --- 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 index 5ac27ee4..b795deb2 100755 --- 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 index 70bf0758..96813239 100755 --- 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 index 55d28c87..e1216872 100755 --- a/projects/vboot/vboot +++ b/projects/vboot/vboot @@ -77,8 +77,8 @@ build() { 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" diff --git a/projects/vpd/vpd b/projects/vpd/vpd index f8ebe59f..1105e588 100755 --- 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 -- cgit v1.2.3-70-g09d2