Skip to content

build-tools.sh: fix wrong variable names as reported by shellcheck #3365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 2 commits into from
Aug 31, 2020
Merged

build-tools.sh: fix wrong variable names as reported by shellcheck #3365

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecf9f4f
build-tools.sh: fix minor shellcheck warnings
marc-hb Aug 28, 2020
8e17af8
build-tools.sh: fix misnamed locals DO_BUILD_topology and _test
marc-hb Aug 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions scripts/build-tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ make_tool()
# if no argument provided, all the tools will be built. Empty tool is
# okay.
tool=$1
# shellcheck disable=SC2086
make -C "$BUILD_TOOLS_DIR" -j "$NO_PROCESSORS" $tool
}

Expand All @@ -64,12 +65,12 @@ EOFUSAGE
main()
{
local DO_BUILD_ctl DO_BUILD_fuzzer DO_BUILD_logger DO_BUILD_probes \
DO_BUILD_test DO_BUILD_topology SCRIPT_DIR SOF_REPO CMAKE_ONLY \
DO_BUILD_tests DO_BUILD_topologies SCRIPT_DIR SOF_REPO CMAKE_ONLY \
BUILD_ALL
SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
SOF_REPO=$(dirname "$SCRIPT_DIR")
BUILD_TOOLS_DIR="$SOF_REPO"/tools/build_tools
: ${NO_PROCESSORS:=$(nproc)}
: "${NO_PROCESSORS:=$(nproc)}"
BUILD_ALL=false

if [ $# -eq 0 ]; then
Expand All @@ -84,6 +85,8 @@ main()
DO_BUILD_topologies=false
CMAKE_ONLY=false

# eval is a sometimes necessary evil
# shellcheck disable=SC2034
while getopts "cfhlptTC" OPTION; do
case "$OPTION" in
c) DO_BUILD_ctl=true ;;
Expand All @@ -97,7 +100,7 @@ main()
*) print_usage; exit 1;;
esac
done
shift "$(($OPTIND - 1))"
shift "$((OPTIND - 1))"
reconfigure_build

if "$CMAKE_ONLY"; then
Expand Down