From f364333dfdc7e1165558df241b3e5cabdd9e7ca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20Hedde?= Date: Fri, 7 May 2021 20:45:04 +0200 Subject: [PATCH 1/3] completions/makefile: Support GNUmakefile and makefile Close #216 --- completions/makefile.completion.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/completions/makefile.completion.sh b/completions/makefile.completion.sh index c2a833a..bd90cf4 100644 --- a/completions/makefile.completion.sh +++ b/completions/makefile.completion.sh @@ -1,3 +1,3 @@ # Add completion for Makefile # see http://stackoverflow.com/a/38415982/1472048 -complete -W "\`grep -oE '^[a-zA-Z0-9_-]+:([^=]|$)' Makefile | sed 's/[^a-zA-Z0-9_-]*$//'\`" make +complete -W "\`find . -maxdepth 1 -iname '*makefile' -exec grep -oE '^[a-zA-Z0-9_-]+:([^=]|$)' {} \; | sed 's/[^a-zA-Z0-9_-]*$//'\`" make From e0abffc8af286584f65ab646ce3aae8ef9991c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20Hedde?= Date: Tue, 28 Dec 2021 15:36:49 +0100 Subject: [PATCH 2/3] completions/makefile: Respect POSIX compatibility Co-authored-by: Koichi Murase --- completions/makefile.completion.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/completions/makefile.completion.sh b/completions/makefile.completion.sh index bd90cf4..c596a2a 100644 --- a/completions/makefile.completion.sh +++ b/completions/makefile.completion.sh @@ -1,3 +1,3 @@ # Add completion for Makefile # see http://stackoverflow.com/a/38415982/1472048 -complete -W "\`find . -maxdepth 1 -iname '*makefile' -exec grep -oE '^[a-zA-Z0-9_-]+:([^=]|$)' {} \; | sed 's/[^a-zA-Z0-9_-]*$//'\`" make +complete -W "\`shopt -u nullglob; shopt -s nocaseglob; grep -oE '^[a-zA-Z0-9_-]+:([^=]|$)' *makefile 2>/dev/null | sed 's/[^a-zA-Z0-9_-]*$//'\`" make From 6d8896c4dc67b3b0606abda2ce9b156d887b0a7f Mon Sep 17 00:00:00 2001 From: Koichi Murase Date: Wed, 29 Dec 2021 02:00:31 +0900 Subject: [PATCH 3/3] completions/makefile: Adjust quoting --- completions/makefile.completion.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/completions/makefile.completion.sh b/completions/makefile.completion.sh index c596a2a..fd47fea 100644 --- a/completions/makefile.completion.sh +++ b/completions/makefile.completion.sh @@ -1,3 +1,3 @@ # Add completion for Makefile # see http://stackoverflow.com/a/38415982/1472048 -complete -W "\`shopt -u nullglob; shopt -s nocaseglob; grep -oE '^[a-zA-Z0-9_-]+:([^=]|$)' *makefile 2>/dev/null | sed 's/[^a-zA-Z0-9_-]*$//'\`" make +complete -W "\$(shopt -u nullglob; shopt -s nocaseglob; command grep -oE '^[a-zA-Z0-9_-]+:([^=]|\$)' *makefile 2>/dev/null | command sed 's/[^a-zA-Z0-9_-]*\$//')" make