From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0DD121387FD for ; Fri, 28 Mar 2014 18:43:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A0CDE0BF8; Fri, 28 Mar 2014 18:42:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E46A0E0BF8 for ; Fri, 28 Mar 2014 18:42:50 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D9C0033FDC8 for ; Fri, 28 Mar 2014 18:42:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 548A0188E8 for ; Fri, 28 Mar 2014 18:42:47 +0000 (UTC) From: "Tim Harder" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tim Harder" Message-ID: <1396032151.e60675e939a9af7719f6a11ebee1223d2f79f83e.radhermit@gentoo> Subject: [gentoo-commits] proj/zsh-completion:master commit in: / X-VCS-Repository: proj/zsh-completion X-VCS-Files: _portage_utils X-VCS-Directories: / X-VCS-Committer: radhermit X-VCS-Committer-Name: Tim Harder X-VCS-Revision: e60675e939a9af7719f6a11ebee1223d2f79f83e X-VCS-Branch: master Date: Fri, 28 Mar 2014 18:42:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 72f944c2-f092-4e2e-908c-391ec3f4fb2f X-Archives-Hash: e421aba2c7db0b7bffd493af1f483f92 commit: e60675e939a9af7719f6a11ebee1223d2f79f83e Author: Tim Harder gentoo org> AuthorDate: Fri Mar 28 18:42:31 2014 +0000 Commit: Tim Harder gentoo org> CommitDate: Fri Mar 28 18:42:31 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/zsh-completion.git;a=commit;h=e60675e9 _portage_utils: fix whitespace --- _portage_utils | 187 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 94 insertions(+), 93 deletions(-) diff --git a/_portage_utils b/_portage_utils index 7cd05c1..ead6ca0 100644 --- a/_portage_utils +++ b/_portage_utils @@ -4,12 +4,13 @@ # local common_args PORTDIR var=PORTDIR + [[ -z ${(P)var} && -r /etc/portage/make.conf ]] && -local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`" + local $var="`. /etc/portage/make.conf 2>/dev/null; echo ${(P)var}`" [[ -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 /usr/share/portage/config/make.globals ]] && -local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`" + local $var="`. /usr/share/portage/config/make.globals 2>/dev/null; echo ${(P)var}`" common_args=( {'(--verbose)-v','(-v)--verbose'}'[Make a lot of noise]' \ @@ -18,37 +19,38 @@ common_args=( {'(--help)-h','(-h)--help'}'[Print this help and exit]' \ {'(--version)-V','(-V)--version'}'[Print version and exit]' \ ) + case $service in qcheck) _arguments -s $common_args \ - {'(--all)-a','(-a)--all'}'[List all packages]' \ - {'(--update)-u','(-u)--update'}'[Update chksum and mtimes for packages]' \ - '*:packages:_gentoo_packages installed' + {'(--all)-a','(-a)--all'}'[List all packages]' \ + {'(--update)-u','(-u)--update'}'[Update chksum and mtimes for packages]' \ + '*:packages:_gentoo_packages installed' ;; qdepends) _arguments -s $common_args \ - {'(--depend)-d','(-d)--depend'}'[Show DEPEND info (default)]' \ - {'(--rdepend)-r','(-r)--rdepend'}'[Show RDEPEND info]' \ - {'(--pdepend)-p','(-p)--pdepend'}'[Show PDEPEND info]' \ - {'(--key)-k','(-k)--key'}'[User defined vdb key]' \ - {'(--query)-Q','(-Q)--query'}'[Query reverse deps]' \ - {'(--name-only)-N','(-N)--name-only'}'[Only show package name]' \ - {'(--all)-a','(-a)--all'}'[Show all DEPEND info]' \ - '*:packages:_gentoo_packages installed' + {'(--depend)-d','(-d)--depend'}'[Show DEPEND info (default)]' \ + {'(--rdepend)-r','(-r)--rdepend'}'[Show RDEPEND info]' \ + {'(--pdepend)-p','(-p)--pdepend'}'[Show PDEPEND info]' \ + {'(--key)-k','(-k)--key'}'[User defined vdb key]' \ + {'(--query)-Q','(-Q)--query'}'[Query reverse deps]' \ + {'(--name-only)-N','(-N)--name-only'}'[Only show package name]' \ + {'(--all)-a','(-a)--all'}'[Show all DEPEND info]' \ + '*:packages:_gentoo_packages installed' ;; qfile) - _arguments -s $common_args \ - {'(--exact)-e','(-e)--exact'}'[Exact match]' \ - '*:filename:_files' + _arguments -s $common_args \ + {'(--exact)-e','(-e)--exact'}'[Exact match]' \ + '*:filename:_files' ;; qgrep) - _arguments -s $common_args \ - {'(--invert-match)-I','(-I)--invert-match'}'[Select non-matching lines]' \ - {'(--ignore-case)-i','(-i)--ignore-case'}'[Ignore case distinctions]' \ - {'(--with-filename)-H','(-H)--with-filename'}'[Print the filename for each match]' \ - {'(--count)-c','(-c)--count'}'[Only print a count of matching lines per FILE]' \ - {'(--regexp)-e','(-e)--regexp'}'[Use PATTERN as a regular expression]' \ - '*:pattern::' + _arguments -s $common_args \ + {'(--invert-match)-I','(-I)--invert-match'}'[Select non-matching lines]' \ + {'(--ignore-case)-i','(-i)--ignore-case'}'[Ignore case distinctions]' \ + {'(--with-filename)-H','(-H)--with-filename'}'[Print the filename for each match]' \ + {'(--count)-c','(-c)--count'}'[Only print a count of matching lines per FILE]' \ + {'(--regexp)-e','(-e)--regexp'}'[Use PATTERN as a regular expression]' \ + '*:pattern::' ;; qcache) local arches allarches arch @@ -58,91 +60,90 @@ qcache) for arch in $arches;do allarches=($allarches $arch) done - _describe -t available-arches "arch" allarches + _describe -t available-arches "arch" allarches } - _arguments -s $common_args \ - '*:arch:show_archs' + _arguments -s $common_args \ + '*:arch:show_archs' ;; qlist) - _arguments -s $common_args \ - {'(--installed)-I','(-I)--installed'}'[Just show installed packages]' \ - {'(--slots)-S','(-S)--slots'}'[Display installed packages with slots]' \ - {'(--repo)-R','(-R)--repo'}'[Display installed packages with repository]' \ - {'(--umap)-U','(-U)--umap'}'[Display installed packages with flags used]' \ - {'(--columns)-c','(-c)--columns'}'[Display column view]' \ - '--show-debug[Show /usr/lib/debug files]' \ - {'(--exact)-e','(-e)--exact'}'[Exact match (only CAT/PN or PN without PV)]' \ - {'(--all)-a','(-a)--all'}'[Show every installed package]' \ - {'(--dir)-d','(-d)--dir'}'[Only show directories]' \ - {'(--obj)-o','(-o)--obj'}'[Only show objects]' \ - {'(--sym)-s','(-s)--sym'}'[Only show symlinks]' \ - '--root[Set the ROOT env var]:root directory:_files -/' \ - '*:packages:_gentoo_packages installed' + _arguments -s $common_args \ + {'(--installed)-I','(-I)--installed'}'[Just show installed packages]' \ + {'(--slots)-S','(-S)--slots'}'[Display installed packages with slots]' \ + {'(--repo)-R','(-R)--repo'}'[Display installed packages with repository]' \ + {'(--umap)-U','(-U)--umap'}'[Display installed packages with flags used]' \ + {'(--columns)-c','(-c)--columns'}'[Display column view]' \ + '--show-debug[Show /usr/lib/debug files]' \ + {'(--exact)-e','(-e)--exact'}'[Exact match (only CAT/PN or PN without PV)]' \ + {'(--all)-a','(-a)--all'}'[Show every installed package]' \ + {'(--dir)-d','(-d)--dir'}'[Only show directories]' \ + {'(--obj)-o','(-o)--obj'}'[Only show objects]' \ + {'(--sym)-s','(-s)--sym'}'[Only show symlinks]' \ + '--root[Set the ROOT env var]:root directory:_files -/' \ + '*:packages:_gentoo_packages installed' ;; qlop) - _arguments -s $common_args \ - {'(--gauge)-g','(-g)--gauge'}'[Gauge number of times a package has been merged]' \ - {'(--time)-t','(-t)--time'}'[Calculate merge time for a specific package]' \ - {'(--human)-H','(-H)--human'}'[Print seconds in human readable format (needs -t)]' \ - {'(--list)-l','(-l)--list'}'[Show merge history]' \ - {'(--unlist)-u','(-u)--unlist'}'[Show unmerge history]' \ - {'(--sync)-s','(-s)--sync'}'[Show sync history]' \ - {'(--current)-c','(-c)--current'}'[Show current emerging packages]' \ - {'(--logfile)-f','(-f)--logfile'}'[Read emerge logfile instead of /var/log/emerge.log]:log:_files' \ - '*:packages:_gentoo_packages available' + _arguments -s $common_args \ + {'(--gauge)-g','(-g)--gauge'}'[Gauge number of times a package has been merged]' \ + {'(--time)-t','(-t)--time'}'[Calculate merge time for a specific package]' \ + {'(--human)-H','(-H)--human'}'[Print seconds in human readable format (needs -t)]' \ + {'(--list)-l','(-l)--list'}'[Show merge history]' \ + {'(--unlist)-u','(-u)--unlist'}'[Show unmerge history]' \ + {'(--sync)-s','(-s)--sync'}'[Show sync history]' \ + {'(--current)-c','(-c)--current'}'[Show current emerging packages]' \ + {'(--logfile)-f','(-f)--logfile'}'[Read emerge logfile instead of /var/log/emerge.log]:log:_files' \ + '*:packages:_gentoo_packages available' ;; qsearch) - _arguments -s $common_args \ - {'(--all)-a','(-a)--all'}'[List the descriptions of every package in the cache]' \ - {'(--cache)-c','(-c)--cache'}'[Use the portage cache]' \ - {'(--search)-s','(-s)--search'}'[Regex search package basenames]' \ - {'(--desc)-S','(-S)--desc'}'[Regex search package descriptions]' \ - {'(--name-only)-N','(-N)--name-only'}'[Only show package name]' \ - {'(--homepage)-H','(-H)--homepage'}'[Show homepage info]' \ - '*:pattern::' + _arguments -s $common_args \ + {'(--all)-a','(-a)--all'}'[List the descriptions of every package in the cache]' \ + {'(--cache)-c','(-c)--cache'}'[Use the portage cache]' \ + {'(--search)-s','(-s)--search'}'[Regex search package basenames]' \ + {'(--desc)-S','(-S)--desc'}'[Regex search package descriptions]' \ + {'(--name-only)-N','(-N)--name-only'}'[Only show package name]' \ + {'(--homepage)-H','(-H)--homepage'}'[Show homepage info]' \ + '*:pattern::' ;; qsize) - _arguments -s $common_args \ - {'(--filesystem)-f','(-f)--filesystem'}'[Show size used on disk]' \ - {'(--all)-a','(-a)--all'}'[Size all installed packages]' \ - {'(--sum)-s','(-s)--sum'}'[Include a summary]' \ - {'(--sum-only)-S','(-S)--sum-only'}'[Show just the summary]' \ - {'(--megabyte)-m','(-m)--megabyte'}'[Display size in megabytes]' \ - {'(--kilobyte)-k','(-k)--kilobyte'}'[Display size in kilobytes]' \ - {'(--byte)-b','(-b)--byte'}'[Display size in bytes]' \ - '*:packages:_gentoo_packages installed' + _arguments -s $common_args \ + {'(--filesystem)-f','(-f)--filesystem'}'[Show size used on disk]' \ + {'(--all)-a','(-a)--all'}'[Size all installed packages]' \ + {'(--sum)-s','(-s)--sum'}'[Include a summary]' \ + {'(--sum-only)-S','(-S)--sum-only'}'[Show just the summary]' \ + {'(--megabyte)-m','(-m)--megabyte'}'[Display size in megabytes]' \ + {'(--kilobyte)-k','(-k)--kilobyte'}'[Display size in kilobytes]' \ + {'(--byte)-b','(-b)--byte'}'[Display size in bytes]' \ + '*:packages:_gentoo_packages installed' ;; quse) - _arguments -s $common_args \ - {'(--exact)-e','(-e)--exact'}'[Show exact non regexp matching using strcmp]' \ - {'(--all)-a','(-a)--all'}'[Show annoying things in IUSE]' \ - {'(--keywords)-K','(-K)--keywords'}'[Use the KEYWORDS vs IUSE]' \ - {'(--license)-L','(-L)--license'}'[Use the LICENSE vs IUSE]' \ - {'(--describe)-D','(-D)--describe'}'[Describe the USE flag]' \ - {'(--name-only)-N','(-N)--name-only'}'[Only show package name]' \ - '*:use flag:_gentoo_packages useflag' + _arguments -s $common_args \ + {'(--exact)-e','(-e)--exact'}'[Show exact non regexp matching using strcmp]' \ + {'(--all)-a','(-a)--all'}'[Show annoying things in IUSE]' \ + {'(--keywords)-K','(-K)--keywords'}'[Use the KEYWORDS vs IUSE]' \ + {'(--license)-L','(-L)--license'}'[Use the LICENSE vs IUSE]' \ + {'(--describe)-D','(-D)--describe'}'[Describe the USE flag]' \ + {'(--name-only)-N','(-N)--name-only'}'[Only show package name]' \ + '*:use flag:_gentoo_packages useflag' ;; qtbz2) - _arguments -s $common_args \ - {'(--join -s --split -t --tarbz2 -x --xpak)-j','(-t --tarbz2 -j -s --split -x --xpak)--join'}'[Join tar.bz2 + xpak into a tbz2]:*:tar.bz2 file and xpak file:_files -g \*.\(tar.bz2\|xpak\)' \ - {'(--join -j --split -t --tarbz2 -x --xpak)-s','(-t --tarbz2 -j --join -s -x --xpak)--split'}'[Split a tbz2 into a tar.bz2 + xpak]:tbz2 file:_files -g \*.tbz2' \ - {'(--join -j -s --split --tarbz2 -x --xpak)-t','(--join -j -s --split -t -x --xpak)--tarbz2'}'[Just split the tar.bz2]:tbz2 file:_files -g \*.tbz2' \ - {'(--join -j -s --split -t --tarbz2 --xpak)-x','(--join -j -s --split -t --tarbz2 -x)--xpak'}'[Just split the xpak]:tbz2 file:_files -g \*.tbz2' \ - {'(--stdout)-O','(-O)--stdout'}'[Write files to stdout]' + _arguments -s $common_args \ + {'(--join -s --split -t --tarbz2 -x --xpak)-j','(-t --tarbz2 -j -s --split -x --xpak)--join'}'[Join tar.bz2 + xpak into a tbz2]:*:tar.bz2 file and xpak file:_files -g \*.\(tar.bz2\|xpak\)' \ + {'(--join -j --split -t --tarbz2 -x --xpak)-s','(-t --tarbz2 -j --join -s -x --xpak)--split'}'[Split a tbz2 into a tar.bz2 + xpak]:tbz2 file:_files -g \*.tbz2' \ + {'(--join -j -s --split --tarbz2 -x --xpak)-t','(--join -j -s --split -t -x --xpak)--tarbz2'}'[Just split the tar.bz2]:tbz2 file:_files -g \*.tbz2' \ + {'(--join -j -s --split -t --tarbz2 --xpak)-x','(--join -j -s --split -t --tarbz2 -x)--xpak'}'[Just split the xpak]:tbz2 file:_files -g \*.tbz2' \ + {'(--stdout)-O','(-O)--stdout'}'[Write files to stdout]' ;; qpkg) - _arguments -s $common_args \ - {'(--pretend)-p','(-p)--pretend'}'[pretend only]' \ - {'(--pkgdir)-P','(-P)--pkgdir'}'[alternate package directory]:alternate pkgdir:_files -/' \ - '*:Installed packages:_gentoo_packages installed_versions' + _arguments -s $common_args \ + {'(--pretend)-p','(-p)--pretend'}'[pretend only]' \ + {'(--pkgdir)-P','(-P)--pkgdir'}'[alternate package directory]:alternate pkgdir:_files -/' \ + '*:Installed packages:_gentoo_packages installed_versions' ;; qxpak) - _arguments -s $common_args \ - {'(--list --extract -x --create -c)-l','(-l --extract -x --create -c)--list'}'[List the contents of an archive]:xpak archive:_files -g \*.xpak' \ - {'(--list -l --extract --create -c)-x','(--list -l -x --create -c)--extract'}'[Extract the contents of an archive]:xpak archive:_files -g \*.xpak' \ - {'(--list -l --extract -x --create)-c','(--list -l --extract -x -c)--create'}'[Create an archive of a directory/files]:*:archive name and files to archive:_files' \ - {'(--dir)-d','(-d)--dir'}'[Change to specified directory]:directory:_files -/' \ - {'(--stdout)-O','(-O)--stdout'}'[Write files to stdout]' - + _arguments -s $common_args \ + {'(--list --extract -x --create -c)-l','(-l --extract -x --create -c)--list'}'[List the contents of an archive]:xpak archive:_files -g \*.xpak' \ + {'(--list -l --extract --create -c)-x','(--list -l -x --create -c)--extract'}'[Extract the contents of an archive]:xpak archive:_files -g \*.xpak' \ + {'(--list -l --extract -x --create)-c','(--list -l --extract -x -c)--create'}'[Create an archive of a directory/files]:*:archive name and files to archive:_files' \ + {'(--dir)-d','(-d)--dir'}'[Change to specified directory]:directory:_files -/' \ + {'(--stdout)-O','(-O)--stdout'}'[Write files to stdout]' ;; esac