summaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorGiancarlo Razzolini <grazzolini@archlinux.org>2019-10-07 05:14:43 +0200
committerGiancarlo Razzolini <grazzolini@archlinux.org>2019-10-07 05:14:43 +0200
commit9ae6b1f928ef11e277437740908871ab535b655d (patch)
tree32d6ee5d5a5ec799e295e96f7bed516baac793d1 /shell
parent6b7427861b923560c10184ba92df2e7cc13ac258 (diff)
parent51a8337b6c461ac29710664ed084c99f57c4118a (diff)
downloadmkinitcpio-26.tar.gz
mkinitcpio-26.tar.xz
Merge branch 'fix-hookdir-flag'v26
Added the hookdir flag to the parser and also added it to the completions.
Diffstat (limited to 'shell')
-rw-r--r--shell/bash-completion4
-rw-r--r--shell/zsh-completion1
2 files changed, 3 insertions, 2 deletions
diff --git a/shell/bash-completion b/shell/bash-completion
index a0f07dc..8f3663d 100644
--- a/shell/bash-completion
+++ b/shell/bash-completion
@@ -56,7 +56,7 @@ _files_from_dirs() {
_mkinitcpio() {
local action cur prev opts
- opts=(-A --addhooks -c --config -g --generate -H --hookhelp -h --help -k --kernel
+ opts=(-A --addhooks -c --config -D --hookdir -g --generate -H --hookhelp -h --help -k --kernel
-L --listhooks -M --automods -n --nocolor -P --allpresets -p --preset -r --moduleroot
-S --skiphooks -s --save -t --builddir -V --version -v --verbose -z --compress)
@@ -65,7 +65,7 @@ _mkinitcpio() {
case $prev in
-[cg]|--config|--generate)
_filedir ;;
- -r|--moduleroot|-t|--builddir)
+ -D|--hookdir|-r|--moduleroot|-t|--builddir)
_filedir -d ;;
-k|--kernel)
_find_kernel_versions ;;
diff --git a/shell/zsh-completion b/shell/zsh-completion
index 4d1e435..587e3b2 100644
--- a/shell/zsh-completion
+++ b/shell/zsh-completion
@@ -39,6 +39,7 @@ case $service in
_arguments : \
'(-A --addhooks)'{-A,--addhooks}'[Add specified hooks, comma separated, to image]::usr hooks:_path_files -W /usr/lib/initcpio/install::lib hooks:_path_files -W /lib/initcpio/install' \
'(-c --config)'{-c,--config}'[Use alternate config file. (default: /etc/mkinitcpio.conf)]:config files:_files' \
+ '(-D --hookdir)'{-D,--hookdir}'[Specify where to look for hooks.]:directories:_files -/' \
'(-g --generate)'{-g,--generate}'[Generate cpio image and write to specified path]:config files:_files' \
'(-H --hookhelp)'{-H,--hookhelp}'[Display help for given hook and exit]::usr hooks:_path_files -W /usr/lib/initcpio/install::lib hooks:_path_files -W /lib/initcpio/install' \
'(-h --help)'{-h,--help}'[Display this message and exit]' \