Use correct command to get installed ports

This fixes a copy-paste error when we completed any port name instead of
installed ones
This commit is contained in:
Aljaž "g5pw" Srebrnič 2014-02-19 08:55:29 +01:00
parent 8842103478
commit 42aace253f
1 changed files with 12 additions and 88 deletions

100
src/_port
View File

@ -20,84 +20,19 @@ _port() {
typeset -A opt_args typeset -A opt_args
local context state state_descr line local context state state_descr line
typeset -a upgrade_options revupgrade_options select_options \ local actions pseudo_common pseudo_advanced select_options port_prefix
actions pseudo_common pseudo_advanced port_prefix
port_prefix=$(which port | sed 's|/bin/port||') port_prefix=$(which port | sed 's|/bin/port||')
actions=( actions=( activate archive archivefetch build cat cd
'activate\:Activate\ the\ given\ ports' checksum clean configure contents deactivate dependents deps
'archive\:Archive\ the\ given\ ports,\ i.e.\ install\ the\ port\ image\ but\ do\ not\ activate' destroot dir distcheck distfiles dmg dpkg echo edit exit
'archivefetch\:Fetch\ archive\ for\ the\ given\ ports' extract fetch file gohome help info install installed lint list
'build\:Build\ the\ given\ ports' livecheck load location log logfile mdmg mirror mpkg notes
'cat\:Writes\ the\ Portfiles\ of\ the\ given\ ports\ to\ stdout' outdated patch pkg platform portpkg provides quit rdependents
'cd\:Changes\ to\ the\ directory\ of\ the\ given\ port' rdeps rev-upgrade rpm search select selfupdate setrequested space
'checksum\:Compares\ the\ checksums\ for\ the\ downloaded\ files\ of\ the\ given\ ports' srpm submit sync test unarchive uninstall unload unsetrequested
'clean\:Removes\ files\ associated\ with\ the\ given\ ports' upgrade url usage variants version work )
'configure\:Removes\ files\ associated\ with\ the\ given\ ports'
'contents\Returns\ a\ list\ of\ files\ installed\ by\ given\ ports'
'deactivate\:Deactivates\ the\ given\ ports'
'dependents\:Returns\ a\ list\ of\ installed\ dependents\ for\ each\ of\ the\ given\ ports'
'deps\:Display\ a\ dependency\ listing\ for\ the\ given\ ports'
'destroot\:Destroot\ the\ given\ ports'
'dir\:Returns\ the\ directories\ of\ the\ given\ ports'
'distcheck\:Checks\ if\ the\ given\ ports\ can\ be\ fetched\ from\ all\ of\ its\ master_sites'
'distfiles\:Returns\ a\ list\ of\ distfiles\ for\ the\ given\ port'
'dmg\:Creates\ a\ dmg\ for\ each\ of\ the\ given\ ports'
'dpkg\:Creates\ a\ dpkg\ for\ each\ of\ the\ given\ ports'
'echo\:Returns\ the\ list\ of\ ports\ the\ argument\ expands\ to'
'edit'
'exit'
'extract\:Extract\ the\ downloaded\ files\ of\ the\ given\ ports'
'fetch'
'file'
'gohome'
'help'
'info'
'install'
'installed'
'lint'
'list'
'livecheck'
'load'
'location'
'log'
'logfile'
'mdmg'
'mirror'
'mpkg'
'notes'
'outdated'
'patch'
'pkg'
'platform'
'portpkg'
'provides'
'quit'
'rdependents'
'rdeps'
'rev-upgrade'
'rpm'
'search'
'select'
'selfupdate'
'setrequested'
'space'
'srpm'
'submit'
'sync'
'test'
'unarchive'
'uninstall'
'unload'
'unsetrequested'
'upgrade'
'url'
'usage'
'variants'
'version'
'work'
)
pseudo_common=(all current active inactive actinact installed uninstalled outdated pseudo_common=(all current active inactive actinact installed uninstalled outdated
obsolete requested unrequested leaves) obsolete requested unrequested leaves)
@ -115,12 +50,6 @@ _port() {
revupgrade_options=('--id-loadcmd-check:Run more checks against a special loadcommand in Mach-O binaries') revupgrade_options=('--id-loadcmd-check:Run more checks against a special loadcommand in Mach-O binaries')
upgrade_options=(
'--force\:Ignore\ circumstances\ that\ would\ normally\ cause\ ports\ to\ be\ skipped\ \(e.g.\ not\ outdated\).' \
'--enforce-variants\:If\ the\ installed\ variants\ do\ not\ match\ those\ requested,\ upgrade\ even\ if\ the\ port\ is\ not\ outdated.' \
'--no-replace\:Do\ not\ replace\ one\ port\ with\ another\ according\ to\ the\ replaced_by\ field.' \
)
local cache_policy local cache_policy
zstyle -s ":completion:${curcontext}:" cache-policy cache_policy zstyle -s ":completion:${curcontext}:" cache-policy cache_policy
if [[ -z "$cache_policy" ]]; then if [[ -z "$cache_policy" ]]; then
@ -184,14 +113,9 @@ _port_dispatch() {
"pseudo-advanced:Advanced Pseudo-portnames:($pseudo_advanced)" "pseudo-advanced:Advanced Pseudo-portnames:($pseudo_advanced)"
;; ;;
upgrade) upgrade)
# No good reason to actually cache outdated ports list
local outdated_packages local outdated_packages
outdated_packages=( $(_call_program path-outdated "port echo outdated | cut -d ' ' -f 1") ) outdated_packages=("${(f)$(port outdated | sed -e '1 d' -e 's/^\([[:graph:]]*\).*/\1/')}")
_alternative -- \ _describe "Outdated ports" outdated_packages
"upgrade-options:Upgrade options:(($upgrade_options))" \
"ports:Outdated ports:($outdated_packages)" \
"pseudo-common:Common Pseudo-portnames:($pseudo_common)" \
"pseudo-advanced:Advanced Pseudo-portnames:($pseudo_advanced)"
;; ;;
rev-upgrade) rev-upgrade)
if (( CURRENT == 3 )); then if (( CURRENT == 3 )); then