25/06/2018 04:49, Gavin Hu:
> On some linux distributions, eg: CentOS, the ninja executable has a
> different name: ninja-build, this patch is to check and adapt to it
> accordingly.
>
> ./devtools/test-meson-builds.sh: line 24: ninja: command not found
>
> Fixes: a55277a788 ("devtools: add test script for meson builds")
> Cc: [email protected]
>
> Signed-off-by: Gavin Hu <[email protected]>
> Reviewed-by: Phil Yang <[email protected]>
> Reviewed-by: Song Zhu <[email protected]>
> Acked-by: Bruce Richardson <[email protected]>
> ---
> --- a/devtools/test-meson-builds.sh
> +++ b/devtools/test-meson-builds.sh
> +if command -v ninja >/dev/null 2>&1 ; then
> + ninja_cmd=ninja
> +elif command -v ninja-build >/dev/null 2>&1 ; then
> + ninja_cmd=ninja-build
> +else
> + echo "## ERROR: ninja is missing, please install..."
No need of double hash to get attention as it is the last printed line.
Matter of taste, but I prefer more simple (not interpreted) message like:
"ERROR: ninja is not found"
Or even simpler, no message at all and try with ninja_cmd=ninja as default:
if command -v ninja-build >/dev/null 2>&1 ; then
ninja_cmd=ninja-build
else
ninja_cmd=ninja
fi
Will still have the shell message in case of ninja not installed:
ninja: command not found
