|
 |
89397c |
From d16c76d139f9a9a56b49c0dd51cd9056f626031e Mon Sep 17 00:00:00 2001
|
|
|
89397c |
From: Peter Jones <pjones@redhat.com>
|
|
|
89397c |
Date: Tue, 14 Jun 2016 10:20:14 -0400
|
|
|
89397c |
Subject: [PATCH 7/7] Add bash completion file.
|
|
|
89397c |
|
|
|
89397c |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
89397c |
---
|
|
|
89397c |
Makefile.am | 5 +++++
|
|
|
89397c |
configure.ac | 17 +++++++++++++++++
|
|
|
89397c |
data/mokutil | 37 +++++++++++++++++++++++++++++++++++++
|
|
|
89397c |
3 files changed, 59 insertions(+)
|
|
|
89397c |
create mode 100755 data/mokutil
|
|
|
89397c |
|
|
|
89397c |
diff --git a/Makefile.am b/Makefile.am
|
|
|
89397c |
index 9f0d419..c17cc4a 100644
|
|
|
89397c |
--- a/Makefile.am
|
|
|
89397c |
+++ b/Makefile.am
|
|
|
89397c |
@@ -1 +1,6 @@
|
|
|
89397c |
SUBDIRS = src man
|
|
|
89397c |
+
|
|
|
89397c |
+if ENABLE_BASH_COMPLETION
|
|
|
89397c |
+ bashcompletiondir = $(BASH_COMPLETION_DIR)
|
|
|
89397c |
+ dist_bashcompletion_DATA = data/mokutil
|
|
|
89397c |
+endif
|
|
|
89397c |
diff --git a/configure.ac b/configure.ac
|
|
|
89397c |
index 69d412a..7b52a06 100644
|
|
|
89397c |
--- a/configure.ac
|
|
|
89397c |
+++ b/configure.ac
|
|
|
89397c |
@@ -86,6 +86,23 @@ AC_CHECK_FUNCS([memset])
|
|
|
89397c |
PKG_CHECK_MODULES(OPENSSL, [openssl >= 0.9.8])
|
|
|
89397c |
PKG_CHECK_MODULES(EFIVAR, [efivar >= 0.12])
|
|
|
89397c |
|
|
|
89397c |
+AC_ARG_WITH([bash-completion-dir],
|
|
|
89397c |
+ AS_HELP_STRING([--with-bash-completion-dir[=PATH]],
|
|
|
89397c |
+ [Install the bash auto-completion script in this directory. @<:@default=yes@:>@]),
|
|
|
89397c |
+ [],
|
|
|
89397c |
+ [with_bash_completion_dir=yes])
|
|
|
89397c |
+
|
|
|
89397c |
+if test "x$with_bash_completion_dir" = "xyes"; then
|
|
|
89397c |
+ PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0],
|
|
|
89397c |
+ [BASH_COMPLETION_DIR="`pkg-config --variable=completionsdir bash-completion`"],
|
|
|
89397c |
+ [BASH_COMPLETION_DIR="$datadir/bash-completion/completions"])
|
|
|
89397c |
+else
|
|
|
89397c |
+ BASH_COMPLETION_DIR="$with_bash_completion_dir"
|
|
|
89397c |
+fi
|
|
|
89397c |
+
|
|
|
89397c |
+AC_SUBST([BASH_COMPLETION_DIR])
|
|
|
89397c |
+AM_CONDITIONAL([ENABLE_BASH_COMPLETION],[test "x$with_bash_completion_dir" != "xno"])
|
|
|
89397c |
+
|
|
|
89397c |
AC_CONFIG_FILES([Makefile
|
|
|
89397c |
src/Makefile
|
|
|
89397c |
man/Makefile])
|
|
|
89397c |
diff --git a/data/mokutil b/data/mokutil
|
|
|
89397c |
new file mode 100755
|
|
|
89397c |
index 0000000..800b039
|
|
|
89397c |
--- /dev/null
|
|
|
89397c |
+++ b/data/mokutil
|
|
|
89397c |
@@ -0,0 +1,37 @@
|
|
|
89397c |
+#!/bin/bash
|
|
|
89397c |
+
|
|
|
89397c |
+_mokutil()
|
|
|
89397c |
+{
|
|
|
89397c |
+ local cur=${COMP_WORDS[COMP_CWORD]}
|
|
|
89397c |
+
|
|
|
89397c |
+ if [[ "$cur" == -* ]]; then
|
|
|
89397c |
+ #COMPREPLY=( $( compgen -W "--help --list-enrolled --list-new --list-delete --import --delete --revoke-import --revoke-delete --export --password --clear-password --disable-validation --enable-validation --sb-state --test-key --reset --generate-hash --hash-file --root-pw --simple-hash" -- $cur ) )
|
|
|
89397c |
+ COMPREPLY=( $( compgen -W '$( _parse_help "$1" --long-help ) -h -l -N -D -i -d -x -p -c -t -f -g -P -s -X' -- "$cur" ) )
|
|
|
89397c |
+ [[ $COMPREPLY == *= ]] && compopt -o nospace
|
|
|
89397c |
+ return 0
|
|
|
89397c |
+ fi
|
|
|
89397c |
+
|
|
|
89397c |
+ case "${COMP_WORDS[COMP_CWORD-1]}" in
|
|
|
89397c |
+ --import|-i|--delete|-d|--test-key|-t|--hash-file|-f)
|
|
|
89397c |
+ _filedir
|
|
|
89397c |
+ return 0
|
|
|
89397c |
+ ;;
|
|
|
89397c |
+ --import-hash|--delete-hash)
|
|
|
89397c |
+ COMPREPLY=( $( compgen -W "" ) )
|
|
|
89397c |
+ return 0
|
|
|
89397c |
+ ;;
|
|
|
89397c |
+ --set-verbosity)
|
|
|
89397c |
+ COMPREPLY=( $( compgen -W "true false") )
|
|
|
89397c |
+ return 0
|
|
|
89397c |
+ ;;
|
|
|
89397c |
+ --generate-hash|-g)
|
|
|
89397c |
+ COMPREPLY=( $( compgen -o nospace -P= -W "") )
|
|
|
89397c |
+ return 0
|
|
|
89397c |
+ ;;
|
|
|
89397c |
+ *)
|
|
|
89397c |
+ return 0
|
|
|
89397c |
+ ;;
|
|
|
89397c |
+ esac
|
|
|
89397c |
+}
|
|
|
89397c |
+
|
|
|
89397c |
+complete -F _mokutil mokutil
|
|
|
89397c |
--
|
|
|
89397c |
2.7.4
|
|
|
89397c |
|