xinb
/
zsh-completions
mirror of https://github.com/zsh-users/zsh-completions.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #98 

(update gentoo completions to reflect current portage files state)

Signed-off-by: Vadim A. Misbakh-Soloviov <mva@mva.name>
This commit is contained in:
Vadim A. Misbakh-Soloviov 2012-09-06 00:58:05 +07:00
parent 589938ffc9
commit b0e171924e
No known key found for this signature in database
GPG Key ID: 26503D349B3B334B
9 changed files with 46 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/_baselayout
View File

@ -34,7 +34,7 @@
# Authors # Authors
# ------- # -------
# #
# * Vadim A. Misbakh-Soloviev <mva@mva.name> # * Vadim A. Misbakh-Soloviov <mva@mva.name>
# * Bapt <bapt@tuxfamily.org> # * Bapt <bapt@tuxfamily.org>
# * kaworu <kaworu@kaworu.ch> # * kaworu <kaworu@kaworu.ch>
# * David Durrleman <dualmoo@gmail.com> # * David Durrleman <dualmoo@gmail.com>

2
src/_eselect
View File

@ -35,7 +35,7 @@
# Authors # Authors
# ------- # -------
# #
# * Vadim A. Misbakh-Soloviev <mva@mva.name> # * Vadim A. Misbakh-Soloviov <mva@mva.name>
# * Bapt <bapt@tuxfamily.org> # * Bapt <bapt@tuxfamily.org>
# * kaworu <kaworu@kaworu.ch> # * kaworu <kaworu@kaworu.ch>
# * David Durrleman <dualmoo@gmail.com> # * David Durrleman <dualmoo@gmail.com>

4
src/_gcc-config
View File

@ -34,7 +34,7 @@
# Authors # Authors
# ------- # -------
# #
# * Vadim A. Misbakh-Soloviev <mva@mva.name> # * Vadim A. Misbakh-Soloviov <mva@mva.name>
# * Bapt <bapt@tuxfamily.org> # * Bapt <bapt@tuxfamily.org>
# * kaworu <kaworu@kaworu.ch> # * kaworu <kaworu@kaworu.ch>
# * David Durrleman <dualmoo@gmail.com> # * David Durrleman <dualmoo@gmail.com>
@ -48,7 +48,7 @@ local arguments
arguments=( arguments=(
'(- :)'{--use-old,-O}'[use the old profile if one was selected]' '(- :)'{--use-old,-O}'[use the old profile if one was selected]'
'(- :)'{--use-portage-chost,-P}'[only set profile if its CHOST matches /etc/make.conf]:profiles:_gcc_profile' '(- :)'{--use-portage-chost,-P}'[only set profile if its CHOST matches /etc/{portage/}make.conf]:profiles:_gcc_profile'
'(- :)'{--get-current-profile,-c}'[print current used gcc profile]' '(- :)'{--get-current-profile,-c}'[print current used gcc profile]'
'(- :)'{--list-profiles,-l}'[print a list of available profiles]' '(- :)'{--list-profiles,-l}'[print a list of available profiles]'
'(- :)'{--print-environ,-E}'[print environment of the given/current profile]:profiles:_gcc_profile' '(- :)'{--print-environ,-E}'[print environment of the given/current profile]:profiles:_gcc_profile'

2
src/_genlop
View File

@ -34,7 +34,7 @@
# Authors # Authors
# ------- # -------
# #
# * Vadim A. Misbakh-Soloviev <mva@mva.name> # * Vadim A. Misbakh-Soloviov <mva@mva.name>
# * Bapt <bapt@tuxfamily.org> # * Bapt <bapt@tuxfamily.org>
# * kaworu <kaworu@kaworu.ch> # * kaworu <kaworu@kaworu.ch>
# * David Durrleman <dualmoo@gmail.com> # * David Durrleman <dualmoo@gmail.com>

48
src/_gentoo_packages
View File

@ -35,7 +35,7 @@
# Authors # Authors
# ------- # -------
# #
# * Vadim A. Misbakh-Soloviev <mva@mva.name> # * Vadim A. Misbakh-Soloviov <mva@mva.name>
# * Bapt <bapt@tuxfamily.org> # * Bapt <bapt@tuxfamily.org>
# * kaworu <kaworu@kaworu.ch> # * kaworu <kaworu@kaworu.ch>
# * David Durrleman <dualmoo@gmail.com> # * David Durrleman <dualmoo@gmail.com>
@ -47,7 +47,7 @@
# List installed overlays # List installed overlays
_gentoo_packages_overlays () { _gentoo_packages_overlays () {
for f in /etc/make.conf /etc/make.globals; do for f in /etc/portage/make.conf /etc/make.conf /usr/share/portage/config/make.globals; do
[[ -z "$PORTDIR_OVERLAY" && -r "$f" ]] && [[ -z "$PORTDIR_OVERLAY" && -r "$f" ]] &&
local PORTDIR_OVERLAY="`. "$f" 2>/dev/null; echo ${PORTDIR_OVERLAY}`" local PORTDIR_OVERLAY="`. "$f" 2>/dev/null; echo ${PORTDIR_OVERLAY}`"
done done
@ -66,10 +66,12 @@ _gentoo_packages_sets() {
_gentoo_packages_licenses () { _gentoo_packages_licenses () {
local licenses var PORTDIR local licenses var PORTDIR
var=PORTDIR var=PORTDIR
[[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
[[ -z ${(P)var} && -r /etc/make.conf ]] && [[ -z ${(P)var} && -r /etc/make.conf ]] &&
local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`" local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
[[ -z ${(P)var} && -r /etc/make.globals ]] && [[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`" local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
licenses=($PORTDIR/licenses/*(:t)) licenses=($PORTDIR/licenses/*(:t))
compadd $licenses compadd $licenses
} }
@ -78,10 +80,12 @@ _gentoo_packages_licenses () {
_gentoo_packages_useflag(){ _gentoo_packages_useflag(){
local flags var PORTDIR local flags var PORTDIR
var=PORTDIR var=PORTDIR
[[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
[[ -z ${(P)var} && -r /etc/make.conf ]] && [[ -z ${(P)var} && -r /etc/make.conf ]] &&
local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`" local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
[[ -z ${(P)var} && -r /etc/make.globals ]] && [[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`" local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
flags=( ${${(M)${(f)"$(<$PORTDIR/profiles/use.desc)"}:#* - *}%% - *} flags=( ${${(M)${(f)"$(<$PORTDIR/profiles/use.desc)"}:#* - *}%% - *}
${${${(M)${(f)"$(<$PORTDIR/profiles/use.local.desc)"}#* - *}%% - *}#*:} ) ${${${(M)${(f)"$(<$PORTDIR/profiles/use.local.desc)"}#* - *}%% - *}#*:} )
@ -91,6 +95,8 @@ _gentoo_packages_useflag(){
_gentoo_packages_active_useflag(){ _gentoo_packages_active_useflag(){
local flags var USE local flags var USE
var=USE var=USE
[[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
[[ -z ${(P)var} && -r /etc/make.conf ]] && [[ -z ${(P)var} && -r /etc/make.conf ]] &&
local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`" local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
flags=(${${${=USE}%-*}%\\*}) flags=(${${${=USE}%-*}%\\*})
@ -99,10 +105,12 @@ _gentoo_packages_active_useflag(){
_gentoo_packages_category(){ _gentoo_packages_category(){
local var trees category local var trees category
for var in PORTDIR PORTDIR_OVERLAY ; do for var in PORTDIR PORTDIR_OVERLAY ; do
[[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
[[ -z ${(P)var} && -r /etc/make.conf ]] && [[ -z ${(P)var} && -r /etc/make.conf ]] &&
local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`" local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
[[ -z ${(P)var} && -r /etc/make.globals ]] && [[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`" local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
done done
trees=($PORTDIR $=PORTDIR_OVERLAY) trees=($PORTDIR $=PORTDIR_OVERLAY)
category=( $trees/*-*(/:t) ) category=( $trees/*-*(/:t) )
@ -136,10 +144,12 @@ _gentoo_packages_available_pkgnames_only(){
local var trees packages local var trees packages
for var in PORTDIR PORTDIR_OVERLAY ; do for var in PORTDIR PORTDIR_OVERLAY ; do
[[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
[[ -z ${(P)var} && -r /etc/make.conf ]] && [[ -z ${(P)var} && -r /etc/make.conf ]] &&
local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`" local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
[[ -z ${(P)var} && -r /etc/make.globals ]] && [[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`" local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
done done
trees=( $PORTDIR $=PORTDIR_OVERLAY) trees=( $PORTDIR $=PORTDIR_OVERLAY)
@ -151,10 +161,12 @@ _gentoo_packages_available(){
local var trees category packages pkg expl local var trees category packages pkg expl
for var in PORTDIR PORTDIR_OVERLAY ; do for var in PORTDIR PORTDIR_OVERLAY ; do
[[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
[[ -z ${(P)var} && -r /etc/make.conf ]] && [[ -z ${(P)var} && -r /etc/make.conf ]] &&
local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`" local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
[[ -z ${(P)var} && -r /etc/make.globals ]] && [[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`" local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
done done
trees=( $PORTDIR $=PORTDIR_OVERLAY) trees=( $PORTDIR $=PORTDIR_OVERLAY)
category=( $trees/*-*(/:t) ) category=( $trees/*-*(/:t) )
@ -179,10 +191,12 @@ _gentoo_packages_available_versions(){
local var overlay_ebuilds portage_ebuilds expl trees category local var overlay_ebuilds portage_ebuilds expl trees category
for var in PORTDIR PORTDIR_OVERLAY ; do for var in PORTDIR PORTDIR_OVERLAY ; do
[[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
[[ -z ${(P)var} && -r /etc/make.conf ]] && [[ -z ${(P)var} && -r /etc/make.conf ]] &&
local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`" local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
[[ -z ${(P)var} && -r /etc/make.globals ]] && [[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`" local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
done done
trees=($PORTDIR $=PORTDIR_OVERLAY) trees=($PORTDIR $=PORTDIR_OVERLAY)
category=( $trees/*-*(/:t) ) category=( $trees/*-*(/:t) )
@ -199,10 +213,12 @@ _gentoo_packages_available_versions(){
#Function to show tbz2 files available #Function to show tbz2 files available
_gentoo_packages_binary() { _gentoo_packages_binary() {
[[ -z $PKGDIR && -r /etc/portage/make.conf ]] &&
local PKGDIR="`. /etc/portage/make.conf 2>/dev/null; echo $PKGDIR`"
[[ -z $PKGDIR && -r /etc/make.conf ]] && [[ -z $PKGDIR && -r /etc/make.conf ]] &&
local PKGDIR="`. /etc/make.conf 2>/dev/null; echo $PKGDIR`" local PKGDIR="`. /etc/make.conf 2>/dev/null; echo $PKGDIR`"
[[ -z $PKGDIR && -r /etc/make.globals ]] && [[ -z $PKGDIR && -r /usr/share/portage/config/make.globals ]] &&
local PKGDIR="`. /etc/make.globals 2>/dev/null; echo $PKGDIR`" local PKGDIR="`. /usr/share/portage/config/make.globals 2>/dev/null; echo $PKGDIR`"
# this doesn't take care of ${PORTAGE_BINHOST}. If Gentoo official # this doesn't take care of ${PORTAGE_BINHOST}. If Gentoo official
# binary mirror will be available we should rewrite it accordingly. # binary mirror will be available we should rewrite it accordingly.

2
src/_gentoolkit
View File

@ -35,7 +35,7 @@
# Authors # Authors
# ------- # -------
# #
# * Vadim A. Misbakh-Soloviev <mva@mva.name> # * Vadim A. Misbakh-Soloviov <mva@mva.name>
# * Bapt <bapt@tuxfamily.org> # * Bapt <bapt@tuxfamily.org>
# * kaworu <kaworu@kaworu.ch> # * kaworu <kaworu@kaworu.ch>
# * David Durrleman <dualmoo@gmail.com> # * David Durrleman <dualmoo@gmail.com>

2
src/_layman
View File

@ -34,7 +34,7 @@
# Authors # Authors
# ------- # -------
# #
# * Vadim A. Misbakh-Soloviev <mva@mva.name> # * Vadim A. Misbakh-Soloviov <mva@mva.name>
# * Bapt <bapt@tuxfamily.org> # * Bapt <bapt@tuxfamily.org>
# * kaworu <kaworu@kaworu.ch> # * kaworu <kaworu@kaworu.ch>
# * David Durrleman <dualmoo@gmail.com> # * David Durrleman <dualmoo@gmail.com>

2
src/_portage
View File

@ -36,7 +36,7 @@
# Authors # Authors
# ------- # -------
# #
# * Vadim A. Misbakh-Soloviev <mva@mva.name> # * Vadim A. Misbakh-Soloviov <mva@mva.name>
# * Bapt <bapt@tuxfamily.org> # * Bapt <bapt@tuxfamily.org>
# * kaworu <kaworu@kaworu.ch> # * kaworu <kaworu@kaworu.ch>
# * David Durrleman <dualmoo@gmail.com> # * David Durrleman <dualmoo@gmail.com>

9
src/_portage_utils
View File

@ -35,7 +35,7 @@
# Authors # Authors
# ------- # -------
# #
# * Vadim A. Misbakh-Soloviev <mva@mva.name> # * Vadim A. Misbakh-Soloviov <mva@mva.name>
# * Bapt <bapt@tuxfamily.org> # * Bapt <bapt@tuxfamily.org>
# * kaworu <kaworu@kaworu.ch> # * kaworu <kaworu@kaworu.ch>
# * David Durrleman <dualmoo@gmail.com> # * David Durrleman <dualmoo@gmail.com>
@ -48,10 +48,13 @@
local common_args PORTDIR var local common_args PORTDIR var
var=PORTDIR var=PORTDIR
[[ -z ${(P)var} && -r /etc/portage/make.conf ]] &&
local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`"
[[ -z ${(P)var} && -r /etc/make.conf ]] && [[ -z ${(P)var} && -r /etc/make.conf ]] &&
local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`" local $var="`. /etc/make.conf 2>/dev/null; echo ${(P)var}`"
[[ -z ${(P)var} && -r /etc/make.globals ]] && [[ -z ${(P)var} && -r /usr/share/portage/config/make.globals ]] &&
local $var="`. /etc/make.globals 2>/dev/null; echo ${(P)var}`" local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`"
common_args=( common_args=(
{'(--verbose)-v','(-v)--verbose'}'[Make a lot of noise]' \ {'(--verbose)-v','(-v)--verbose'}'[Make a lot of noise]' \
{'(--quiet)-q','(-q)--quiet'}'[Tighter output; suppress warnings]' \ {'(--quiet)-q','(-q)--quiet'}'[Tighter output; suppress warnings]' \