From 1d49e8e0db405e15cda13fa9d16dc75d9ceaf061 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Wed, 31 Jan 2018 16:59:18 +0100 Subject: [PATCH] docs/tools: Improve bash-completion template and generation This allows us to generate templates also for arguments expecting files (input, output) or PKCS#11 modules. The general ideal was already implemented, but never completed. --- doc/tools/Makefile.am | 7 +++++-- doc/tools/completion-template | 8 ++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/doc/tools/Makefile.am b/doc/tools/Makefile.am index cc2b9448..5eb89209 100644 --- a/doc/tools/Makefile.am +++ b/doc/tools/Makefile.am @@ -36,8 +36,11 @@ tools.html: $(srcdir)/tools.xml $(wildcard $(srcdir)/*.1.xml) $(wildcard $(srcdi $(shell sed -n 's,.*.*.*,\1,pg' $< \ | sort -u | grep -- '^\-' | tr '\n' '|' | sed 's,|$$,,')," \ | sed "s,FILEOPTS,\ - $(shell sed -n 's,.*.*.*filename.*,\1,pg' $< \ - | sort -u | grep -- '^\-' | tr '\n' '|')," \ + $(shell sed -n 's,.*.*.*\(filename\|path\).*,\1,pg' $< \ + | sort -u | grep -- '^\-' | tr '\n' '|' | sed 's,|$$,,' | grep ^ || echo "!*")," \ + | sed "s,MODULEOPTS,\ + $(shell sed -n 's,.*.*.*mod.*,\1,pg' $< \ + | sort -u | grep -- '^\-' | tr '\n' '|' | sed 's,|$$,,' | grep ^ || echo "!*")," \ | sed "s,FUNCTION_NAME,$(shell echo $@ | sed s,-,_,g)," \ | sed "s,PROGRAM_NAME,$@," \ > $@ diff --git a/doc/tools/completion-template b/doc/tools/completion-template index e0796b62..94e40c2c 100644 --- a/doc/tools/completion-template +++ b/doc/tools/completion-template @@ -15,6 +15,14 @@ _FUNCTION_NAME() fi case "${prev}" in + MODULEOPTS) + _filedir so + return 0 + ;; + FILEOPTS) + _filedir + return 0 + ;; OPTSWITHARGS) return 0 ;;