From 4b45acf52990ba892151928070d385657ebd51b9 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 9 Jun 2024 20:59:56 +0200 Subject: [PATCH] ninja: shellcheck setup hook --- pkgs/by-name/ni/ninja/setup-hook.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ni/ninja/setup-hook.sh b/pkgs/by-name/ni/ninja/setup-hook.sh index 6607082b43f3..4f3bc5b5acfa 100644 --- a/pkgs/by-name/ni/ninja/setup-hook.sh +++ b/pkgs/by-name/ni/ninja/setup-hook.sh @@ -1,3 +1,5 @@ +# shellcheck shell=bash + ninjaBuildPhase() { runHook preBuild @@ -9,7 +11,7 @@ ninjaBuildPhase() { fi local flagsArray=( - -j$buildCores + "-j$buildCores" ) concatTo flagsArray ninjaFlags ninjaFlagsArray @@ -24,7 +26,7 @@ ninjaCheckPhase() { if [ -z "${checkTarget:-}" ]; then if ninja -t query test >/dev/null 2>&1; then - checkTarget=test + checkTarget="test" fi fi @@ -38,7 +40,7 @@ ninjaCheckPhase() { fi local flagsArray=( - -j$buildCores + "-j$buildCores" ) concatTo flagsArray ninjaFlags ninjaFlagsArray checkTarget @@ -61,9 +63,9 @@ ninjaInstallPhase() { # shellcheck disable=SC2086 local flagsArray=( - -j$buildCores + "-j$buildCores" ) - : ${installTargets:=install} + : "${installTargets:=install}" concatTo flagsArray ninjaFlags ninjaFlagsArray installTargets echoCmd 'install flags' "${flagsArray[@]}" @@ -72,14 +74,14 @@ ninjaInstallPhase() { runHook postInstall } -if [ -z "${dontUseNinjaBuild-}" -a -z "${buildPhase-}" ]; then +if [ -z "${dontUseNinjaBuild-}" ] && [ -z "${buildPhase-}" ]; then buildPhase=ninjaBuildPhase fi -if [ -z "${dontUseNinjaCheck-}" -a -z "${checkPhase-}" ]; then +if [ -z "${dontUseNinjaCheck-}" ] && [ -z "${checkPhase-}" ]; then checkPhase=ninjaCheckPhase fi -if [ -z "${dontUseNinjaInstall-}" -a -z "${installPhase-}" ]; then +if [ -z "${dontUseNinjaInstall-}" ] && [ -z "${installPhase-}" ]; then installPhase=ninjaInstallPhase fi