78ec19b Propagate jail to Zsh completion invocations — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Propagate jail to Zsh completion invocations

Phil Pennock committed 9 years ago

commit 78ec19b778dd1b96a4e762af3849692398770d58
parent f474379

1 file changed +14 -5

modified scripts/completion/_pkg.in

@@ -1,21 +1,27 @@

 #compdef pkg
 _pkg_cmd() {
 	local jflags=()
 	[[ -n "${_pkg_jail:-}" ]] && jflags=(-j "$_pkg_jail")
 	@prefix@/sbin/pkg "${jflags[@]}" "$@"
 }
 _pkg_installed() {
 	local expl
 	_wanted packages expl package \
 	compadd "$@" - $(@prefix@/sbin/pkg query "%n-%v")
 	compadd "$@" - $(_pkg_cmd query "%n-%v")
 }
 _pkg_available_name() {
 	local expl
 	_wanted packages expl package \
 	compadd "$@" - $(@prefix@/sbin/pkg rquery "%n")
 	compadd "$@" - $(_pkg_cmd rquery "%n")
 }
 _pkg_aliases() {
 	local expl
 	_wanted aliases expl alias \
 	compadd "$@" - $(@prefix@/sbin/pkg alias -ql)
 	compadd "$@" - $(_pkg_cmd alias -ql)
 }
 _pkg_available() {

@@ -26,7 +32,7 @@ _pkg_available() {

 			_files "$@" -g "*.t?z" && ret=0
 		fi
 		if _requested packages; then
 			compadd "$@" - $(@prefix@/sbin/pkg rquery "%n-%v") && ret=0
 			compadd "$@" - $(_pkg_cmd rquery "%n-%v") && ret=0
 		fi
 		(( ret )) || break
 	done

@@ -86,7 +92,7 @@ _pkg_config_opts() {

 _pkg() {
 	local curcontext="$curcontext" state state_descr line expl ret=1
 	local subcmd
 	local subcmd _pkg_jail
 	subcmd=(
 		'add[compatibility interface to install a package]'

@@ -125,6 +131,9 @@ _pkg() {

 		'which[display which package installed a specific file]'
 	)
 	(( ${words[(I)-j]} )) && _pkg_jail="${words[1+${words[(I)-j]}]}"
 	(( ${words[(I)--jail]} )) && _pkg_jail="${words[1+${words[(I)--jail]}]}"
 	_arguments -A -* -C \
 		'(-d --debug)'{-d,--debug}'[increment debug level]' \
 		'(-j --jail)'{-j,--jail}'[execute pkg(8) inside a jail(8)]:jail:_jails' \