1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-12-15 20:51:27 +01:00

42497 (tweaked c.f. 42498): make completion after apt install work on local .deb files

This commit is contained in:
Oliver Kiddle 2018-03-23 09:57:39 +01:00
parent fc37d15e3e
commit f1a52c23fa
2 changed files with 19 additions and 13 deletions

View file

@ -1,3 +1,8 @@
2018-03-23 Oliver Kiddle <okiddle@yahoo.co.uk>
* 42497 (tweaked c.f. 42498): Completion/Debian/Command/_apt:
make completion after apt install work on local .deb files
2018-03-22 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
* 42191: Completion/Darwin/Command/_otool: new completion

View file

@ -408,12 +408,13 @@ _apt-cmd () {
/$'policy\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \| \
/$'update\0'/ \| \
\( \
/$'install\0'\|$'download\0'\|$'source\0'\|$'build-dep\0'/ \
/$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \
\( \
/$'[^\0/]#/'/ /$'[^\0/]#\0'/ ':release name::_apt_releases' \| \
/$'[^\0=]#='/ /$'[^\0=]#\0'/ ':package version::_apt_versions_of_binary_package' \
\) \
/$'(install|download|source|build-dep)\0'/ -'subcmd=${match%?}' \
/$'[^\0]#\0'/ ':packages::_deb_packages -qr "\n\t\- /=" "$expl_packages[@]" avail' \# \
\( \
// '%(.|)/%' -'[[ $subcmd = install ]]' /'[]'/ ':files:package file:_files -g "*.deb(-.)"' \| \
/$'[^\0/=]#\/'/ /'[]'/ ':apt-releases:release name:_apt_releases' \| \
/$'[^\0/=]#='/ /'[]'/ ':apt-package-versions:package version:_apt_versions_of_binary_package' \| \
\) \
\) \| \
/$'remove\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
/$'purge\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
@ -427,7 +428,7 @@ _apt-cmd () {
/"[]"/ ':argument-1::compadd "$expl_action[@]" list search showsrc show depends rdepends policy update install download source build-dep remove upgrade full-upgrade dist-upgrade edit-sources autoclean changelog autoremove purge'
_apt-cmd () {
local expl_action expl_packages
local expl_action expl_packages subcmd
_description actions expl_action 'action'
_description packages expl_packages 'package'
@ -475,11 +476,11 @@ _apt-get () {
/$'upgrade\0'/ \| \
\( \
/$'install\0'\|$'download\0'\|$'source\0'\|$'build-dep\0'/ \
/$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \
\( \
/$'[^\0/]#/'/ /$'[^\0/]#\0'/ ':release name::_apt_releases' \| \
/$'[^\0=]#='/ /$'[^\0=]#\0'/ ':package version::_apt_versions_of_binary_package' \
\) \
/$'[^\0]#\0'/ ':packages::_deb_packages -qr "\n\t\- /=" "$expl_packages[@]" avail' \# \
\( \
/$'[^\0/=]#/'/ /'[]'/ ':apt-releases:release name:_apt_releases' \| \
/$'[^\0/=]#='/ /'[]'/ ':apt-package-versions:package version:_apt_versions_of_binary_package' \
\) \
\) \| \
/$'remove\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
/$'purge\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
@ -662,7 +663,7 @@ _apt_versions_of_binary_package() {
done
done
_describe -t apt-package-versions "package versions" kv "$@"
_describe -t apt-package-versions 'package version' kv "$@"
}
_apt_caching_policy () {