Moin,
Am Fri, Feb 10, 2023 at 05:02:58PM +0100 schrieb Uwe Kleine-König:
> The intend here is to check the return code of grep, no need to call [
> (i.e. test). This fixes an error message:
>
> environment: line 10: [: syntax error: `-q' unexpected
>
> Additionally add -e to force interpretation of
> "${PTXDIST_CROSS_CPPFLAGS}" as pattern. For me
> ${PTXDIST_CROSS_CPPFLAGS} starts with -isystem; without -e this is
> interpreted as option to grep instead of pattern which makes grep emit
>
> grep: invalid option -- 't'
>
> .)
>
> Also add -F to make grep use a fixed-string compare (instead of
> interpreting ${PTXDIST_CROSS_CPPFLAGS} as regexp).
All this makes sense. Thumbs up.
>
> Fixes: ac0aac7fc727 ("impove compile_commands.json handling")
> Signed-off-by: Uwe Kleine-König
> ---
> scripts/lib/ptxd_make_world_compile_commands.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/lib/ptxd_make_world_compile_commands.sh
> b/scripts/lib/ptxd_make_world_compile_commands.sh
> index 56d7378fa28b..2703b5497799 100644
> --- a/scripts/lib/ptxd_make_world_compile_commands.sh
> +++ b/scripts/lib/ptxd_make_world_compile_commands.sh
> @@ -21,7 +21,7 @@ ptxd_make_world_compile_commands_filter() {
> fi
>
> if [ "${src_cmds}" = "${dst_cmds}" ]; then
> - if [ grep -q "${PTXDIST_CROSS_CPPFLAGS}" "${src_cmds}" ]; then
> + if grep -q -F -e "${PTXDIST_CROSS_CPPFLAGS}" "${src_cmds}"; then
Acked-by: Alexander Dahl
Greets
Alex
> ptxd_warning "compile_commands.json is already up to date!"
> return
> fi
> --
> 2.39.0
--
/"\ ASCII RIBBON | »With the first link, the chain is forged. The first
\ / CAMPAIGN | speech censured, the first thought forbidden, the
X AGAINST | first freedom denied, chains us all irrevocably.«
/ \ HTML MAIL| (Jean-Luc Picard, quoting Judge Aaron Satie)
signature.asc
Description: PGP signature
