mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-01-11 08:21:13 +01:00
Akinori Musha: 16534: a few bug fixes and some wording fixes
This commit is contained in:
Oliver Kiddle
parent
6fd9ce2c82
commit
29b704202a
2 changed files with 35 additions and 22 deletions
|
|
@ -1,3 +1,8 @@
|
|||
2002-02-01 Oliver Kiddle <opk@zsh.org>
|
||||
|
||||
* Akinori Musha: 16534: Completion/BSD/Command/_bsd_pkg:
|
||||
a few bug fixes and some wording fixes
|
||||
|
||||
2002-01-31 Oliver Kiddle <opk@zsh.org>
|
||||
|
||||
* unposted: Functions/Prompts/prompt_oliver_setup: add example of
|
||||
|
|
@ -1298,7 +1303,7 @@
|
|||
line-display strings can be hidden; hi and du capabalities in
|
||||
complist are only used if set by the user
|
||||
|
||||
* 15402 (Akinora Musha): Completion/Unix/Command/_cvs: add
|
||||
* 15402 (Akinori Musha): Completion/Unix/Command/_cvs: add
|
||||
support for -R option on BSDs
|
||||
|
||||
2001-07-17 Oliver Kiddle <opk@zsh.org>
|
||||
|
|
|
|||
|
|
@ -1,34 +1,41 @@
|
|||
#compdef pkg_add pkg_delete pkg_info
|
||||
|
||||
(( $+functions[_bsd_pkg_packages] )) ||
|
||||
_bsd_pkg_packages() {
|
||||
local ret=1 paths portsdir
|
||||
(( $+functions[_bsd_pkg_pkgfiles] )) ||
|
||||
_bsd_pkg_pkgfiles() {
|
||||
local ret=1 paths portsdir pkgsdir
|
||||
|
||||
case $OSTYPE in
|
||||
netbsd*)
|
||||
portsdir=/usr/pkg
|
||||
portsdir=/usr/pkgsrc
|
||||
;;
|
||||
*)
|
||||
portsdir=${PORTSDIR:-/usr/ports}
|
||||
;;
|
||||
esac
|
||||
|
||||
pkgsdir=${PACKAGES:-$portsdir/packages}/All
|
||||
|
||||
paths=( "${(@)${(@s.:.)PKG_PATH}:#}" )
|
||||
_files "$@" -g \*.tgz && ret=0
|
||||
(( $#path )) && _files "$@" -W paths -g \*.tgz && ret=0
|
||||
compadd "$@" - $portsdir/packages/All/*.tgz && ret=0
|
||||
compadd "$@" - $pkgsdir/*.tgz && ret=0
|
||||
|
||||
return ret
|
||||
}
|
||||
|
||||
(( $+functions[_bsd_pkg_or_file] )) ||
|
||||
_bsd_pkg_or_file() {
|
||||
(( $+functions[_bsd_pkg_pkgs] )) ||
|
||||
_bsd_pkg_pkgs() {
|
||||
compadd "$@" - ${PKG_DBDIR:-/var/db/pkg}/*(/:t)
|
||||
}
|
||||
|
||||
(( $+functions[_bsd_pkg_pkgs_and_files] )) ||
|
||||
_bsd_pkg_pkgs_and_files() {
|
||||
local ret=1
|
||||
|
||||
if (( $words[(I)-*F*] )); then
|
||||
_files "$@" && ret=0
|
||||
else
|
||||
compadd "$@" - ${PKGDBDIR:-/var/db/pkg}/*(/:t) && ret=0
|
||||
_bsd_pkg_pkgs "$@" && ret=0
|
||||
fi
|
||||
|
||||
return ret
|
||||
|
|
@ -44,10 +51,10 @@ _bsd_pkg() {
|
|||
'-I[don'\''t execute installation scripts]'
|
||||
'-M[run in master mode]'
|
||||
'-n[don'\''t really install packages]'
|
||||
'-p:prefix directory:_files -/'
|
||||
'-p[specify prefix]:prefix directory:_files -/'
|
||||
'-R[don'\''t record]'
|
||||
'-S[run in slave mode]'
|
||||
'-t:mktemp template:_files -/'
|
||||
'-t[specify mktemp template]:mktemp template:_files -/'
|
||||
'-v[be verbose]'
|
||||
)
|
||||
|
||||
|
|
@ -55,7 +62,7 @@ _bsd_pkg() {
|
|||
freebsd*)
|
||||
flags=(
|
||||
$flags[@]
|
||||
'-r[use remote fetching]'
|
||||
'-r[fetch from remote site]'
|
||||
)
|
||||
;;
|
||||
netbsd*)
|
||||
|
|
@ -69,7 +76,7 @@ _bsd_pkg() {
|
|||
|
||||
_arguments -s \
|
||||
$flags[@] \
|
||||
'*:package to install:_bsd_pkg_packages'
|
||||
'*:package to install:_bsd_pkg_pkgfiles'
|
||||
;;
|
||||
|
||||
pkg_delete)
|
||||
|
|
@ -78,7 +85,7 @@ _bsd_pkg() {
|
|||
'-d[remove empty directories]'
|
||||
'-f[force deinstallation]'
|
||||
'-n[don'\''t really deinstall packages]'
|
||||
'-p:prefix directory:_files -/'
|
||||
'-p[specify prefix]:prefix directory:_files -/'
|
||||
'-v[be verbose]'
|
||||
)
|
||||
|
||||
|
|
@ -86,16 +93,17 @@ _bsd_pkg() {
|
|||
freebsd*)
|
||||
flags=(
|
||||
$flags[@]
|
||||
'(:)-a[show all installed packages]'
|
||||
'(:)-a[delete all installed packages]'
|
||||
'-G[do not expand glob patterns]'
|
||||
'-i[be interactive]'
|
||||
'-r[delete recursively]'
|
||||
'-x[use regular expression]'
|
||||
)
|
||||
;;
|
||||
netbsd*)
|
||||
flags=(
|
||||
$flags[@]
|
||||
'(:)-a[show all installed packages]'
|
||||
'(:)-a[delete all installed packages]'
|
||||
'-F[specify each package by an installed file]'
|
||||
'-i[be interactive]'
|
||||
'-O[only delete the package'\''s entries]'
|
||||
|
|
@ -108,7 +116,7 @@ _bsd_pkg() {
|
|||
|
||||
_arguments -s \
|
||||
$flags[@] \
|
||||
'(-a)*:package name:_bsd_pkg_or_file'
|
||||
'(-a)*:package name:_bsd_pkg_pkgs_and_files'
|
||||
;;
|
||||
|
||||
pkg_info)
|
||||
|
|
@ -117,13 +125,13 @@ _bsd_pkg() {
|
|||
'-c[show comment fields]'
|
||||
'-D[show install-message files]'
|
||||
'-d[show long descriptions]'
|
||||
'-e[test if package is installed]:package name:compadd - ${PKG_DBDIR:-/var/db/pkg}/*(\:t)'
|
||||
'-e[test if package is installed]:package name:_bsd_pkg_pkgs'
|
||||
'-f[show packing list instructions]'
|
||||
'-I[show index lines]'
|
||||
'-i[show install scripts]'
|
||||
'-k[show deinstall scripts]'
|
||||
'-L[show full pathnames of files]'
|
||||
'-l:prefix directory:_files -/'
|
||||
'-l[specify prefix string]:prefix string:'
|
||||
'-m[show mtree files]'
|
||||
'-p[show installation prefixes]'
|
||||
'-q[be quiet]'
|
||||
|
|
@ -140,8 +148,8 @@ _bsd_pkg() {
|
|||
'-g[show files that'\''s modified]'
|
||||
'-o[show origin]'
|
||||
'-s[show total size occupied by each package]'
|
||||
'-t:mktemp template:_files -/'
|
||||
'*-W:show which package the file belongs to:_files'
|
||||
'-t[specify mktemp template]:mktemp template:_files -/'
|
||||
'*-W[show which package the file belongs to]:file:_files'
|
||||
'-x[use regular expression]'
|
||||
)
|
||||
;;
|
||||
|
|
@ -160,7 +168,7 @@ _bsd_pkg() {
|
|||
|
||||
_arguments -s \
|
||||
$flags[@] \
|
||||
'(-a)*:package name:_bsd_pkg_or_file'
|
||||
'(-a)*:package name:_bsd_pkg_pkgs_and_files'
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue