Skip to content
Snippets Groups Projects
Verified Commit 9ae6b1f9 authored by Giancarlo Razzolini's avatar Giancarlo Razzolini
Browse files

Merge branch 'fix-hookdir-flag'

Added the hookdir flag to the parser and also added it to the completions.
parents 6b742786 51a8337b
No related branches found
Tags v26
No related merge requests found
......@@ -14,7 +14,8 @@ _f_functions=functions
_f_config=mkinitcpio.conf
_d_hooks="$PWD/hooks:/usr/lib/initcpio/hooks:/lib/initcpio/hooks"
_d_install="$PWD/install:/usr/lib/initcpio/install:/lib/initcpio/install"
_d_flag_{hooks,install}=
_d_flag_hooks=
_d_flag_install=
_d_firmware=({/usr,}/lib/firmware/updates {/usr,}/lib/firmware)
_d_presets=mkinitcpio.d
......@@ -316,8 +317,8 @@ process_preset() (
trap 'cleanup 130' INT
trap 'cleanup 143' TERM
_opt_short='A:c:g:H:hk:nLMPp:r:S:sd:t:Vvz:'
_opt_long=('add:' 'addhooks:' 'config:' 'generate:' 'hookhelp:' 'help'
_opt_short='A:c:D:g:H:hk:nLMPp:r:S:sd:t:Vvz:'
_opt_long=('add:' 'addhooks:' 'config:' 'generate:' 'hookdir': 'hookhelp:' 'help'
'kernel:' 'listhooks' 'automods' 'moduleroot:' 'nocolor' 'allpresets'
'preset:' 'skiphooks:' 'save' 'generatedir:' 'builddir:' 'version' 'verbose' 'compress:')
......
......@@ -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 ;;
......
......@@ -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]' \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment