| 1 |
commit: 1f974c2e3fd1a9124134cc28f6e2d93b214c3c4d |
| 2 |
Author: Vikraman Choudhury <vikraman <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 23 22:47:16 2014 +0000 |
| 4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 24 01:02:15 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/zsh-completion.git;a=commit;h=1f974c2e |
| 7 |
|
| 8 |
Use --{color,colour} options |
| 9 |
|
| 10 |
--no-{color,colour} is deprecated and removed in eselect 1.4. |
| 11 |
|
| 12 |
--- |
| 13 |
_eselect | 30 +++++++++++++++--------------- |
| 14 |
1 file changed, 15 insertions(+), 15 deletions(-) |
| 15 |
|
| 16 |
diff --git a/_eselect b/_eselect |
| 17 |
index 130016a..5b15d50 100644 |
| 18 |
--- a/_eselect |
| 19 |
+++ b/_eselect |
| 20 |
@@ -15,7 +15,7 @@ _eselect_env () { |
| 21 |
_eselect_binutils () { |
| 22 |
local binutilslist |
| 23 |
if (( $words[(I)(set)] )); then |
| 24 |
- binutilslist=(${${${(M)${(f)"$(eselect --no-color binutils list)"}## *}// \**/}//( \[*\] | \[*\] )/}) |
| 25 |
+ binutilslist=(${${${(M)${(f)"$(eselect --color=no binutils list)"}## *}// \**/}//( \[*\] | \[*\] )/}) |
| 26 |
_values "available binutils version" $binutilslist[@] && return 0 |
| 27 |
fi |
| 28 |
_values "binutils options" \ |
| 29 |
@@ -30,7 +30,7 @@ _eselect_binutils () { |
| 30 |
_eselect_kernel () { |
| 31 |
local kernellist |
| 32 |
if (( $words[(I)(set)] )); then |
| 33 |
- kernellist=(${${${(M)${(f)"$(eselect --no-color kernel list)"}## *}// \**/}//( \[*\] | \[*\] )/}) |
| 34 |
+ kernellist=(${${${(M)${(f)"$(eselect --color=no kernel list)"}## *}// \**/}//( \[*\] | \[*\] )/}) |
| 35 |
_values "available kernel version" $kernellist[@] && return 0 |
| 36 |
fi |
| 37 |
_values "kenrel options" \ |
| 38 |
@@ -44,7 +44,7 @@ _eselect_kernel () { |
| 39 |
_eselect_ctags () { |
| 40 |
local ctagslist |
| 41 |
if (( $words[(I)(set)] )); then |
| 42 |
- ctagslist=(${${${(M)${(f)"$(eselect --no-color ctags list)"}## *}// \**/}//( \[*\] | \[*\] )/}) |
| 43 |
+ ctagslist=(${${${(M)${(f)"$(eselect --color=no ctags list)"}## *}// \**/}//( \[*\] | \[*\] )/}) |
| 44 |
_values "available ctags version" $ctagslist[@] && return 0 |
| 45 |
fi |
| 46 |
_values "ctags options" \ |
| 47 |
@@ -59,7 +59,7 @@ _eselect_ctags () { |
| 48 |
_eselect_profile () { |
| 49 |
local profilelist |
| 50 |
if (( $words[(I)(set)] )); then |
| 51 |
- profilelist=(${${${(M)${(f)"$(eselect --no-color profile list)"}## *}// \**/}//( \[*\] | \[*\] )/}) |
| 52 |
+ profilelist=(${${${(M)${(f)"$(eselect --color=no profile list)"}## *}// \**/}//( \[*\] | \[*\] )/}) |
| 53 |
_values -w "available profiles" $profilelist[@] \ |
| 54 |
"--force[Forcibly set the symlink]" && return 0 |
| 55 |
fi |
| 56 |
@@ -74,10 +74,10 @@ _eselect_profile () { |
| 57 |
_eselect_fontconfig () { |
| 58 |
local fclistenabled fclistdisabled |
| 59 |
if (( $words[(I)(enable)] )); then |
| 60 |
- fclistdisabled=(${${${${(M)${(f)"$(eselect --no-color fontconfig list)"}## *}#*\*}// \**/}//( \[*\] | \[*\] )/}) |
| 61 |
+ fclistdisabled=(${${${${(M)${(f)"$(eselect --color=no fontconfig list)"}## *}#*\*}// \**/}//( \[*\] | \[*\] )/}) |
| 62 |
_values -w ".conf to enable" $fclistdisabled[@] && return 0 |
| 63 |
elif (( $words[(I)(disable)] )); then |
| 64 |
- fclistenabled=(${${${(M)${(M)${(f)"$(eselect --no-color fontconfig list)"}## *}#*\*}// \**/}//( \[*\] | \[*\] )/}) |
| 65 |
+ fclistenabled=(${${${(M)${(M)${(f)"$(eselect --color=no fontconfig list)"}## *}#*\*}// \**/}//( \[*\] | \[*\] )/}) |
| 66 |
_values -w ".conf to disable" $fclistenabled[@] && return 0 |
| 67 |
fi |
| 68 |
_values "fontconfig options" \ |
| 69 |
@@ -91,7 +91,7 @@ _eselect_fontconfig () { |
| 70 |
_eselect_opengl () { |
| 71 |
local opengllist |
| 72 |
if (( $words[(I)(set)] )); then |
| 73 |
- opengllist=(${${${(M)${(f)"$(eselect --no-color opengl list)"}## *}// \**/}//( \[*\] | \[*\] )/}) |
| 74 |
+ opengllist=(${${${(M)${(f)"$(eselect --color=no opengl list)"}## *}// \**/}//( \[*\] | \[*\] )/}) |
| 75 |
_values -w "opengl implementations and options" $opengllist[@] \ |
| 76 |
"--use-old[If an implementationis already set, use that one instead]" \ |
| 77 |
"--prefix[Set the source prefix]:path:_files -/" \ |
| 78 |
@@ -109,7 +109,7 @@ _eselect_opengl () { |
| 79 |
_eselect_vi () { |
| 80 |
local vilist |
| 81 |
if (( $words[(I)(set)] )); then |
| 82 |
- vilist=(${${${(M)${(f)"$(eselect --no-color vi list)"}## *}// \**/}//( \[*\] | \[*\] )/}) |
| 83 |
+ vilist=(${${${(M)${(f)"$(eselect --color=no vi list)"}## *}// \**/}//( \[*\] | \[*\] )/}) |
| 84 |
_values -w "vi implementation" $vilist[@] && return 0 |
| 85 |
elif (( $words[(I)(update)] )); then |
| 86 |
_values -w "option" "--if-unset[Do not override existing implementation]" && return 0 |
| 87 |
@@ -127,35 +127,35 @@ _eselect () { |
| 88 |
local globopts sedcmd modnames modopts |
| 89 |
|
| 90 |
globopts=( |
| 91 |
- "--no-colour[Disable coloured output]" \ |
| 92 |
- "--no-color[Disable coloured output]" |
| 93 |
+ "--colour=no[Disable coloured output]" \ |
| 94 |
+ "--color=no[Disable coloured output]" |
| 95 |
) |
| 96 |
- modnames=(${${${(M)${(f)"$(eselect --no-color list-modules)"}## *}// */}// /}) |
| 97 |
+ modnames=(${${${(M)${(f)"$(eselect --color=no list-modules)"}## *}// */}// /}) |
| 98 |
|
| 99 |
if ((CURRENT == 2)); then |
| 100 |
_arguments -s \ |
| 101 |
"$globopts[@]" \ |
| 102 |
"*:portage:_values 'eselect modules' \$modnames[@]" && return 0 |
| 103 |
elif ((CURRENT == 3)); then |
| 104 |
- if [[ $words[2] == --no-colour || $words[2] == --no-color ]]; then |
| 105 |
+ if [[ $words[2] == --colour=no || $words[2] == --color=no ]]; then |
| 106 |
_arguments -s \ |
| 107 |
"*:portage:_values 'eselect modules' \$modnames[@]" && return 0 |
| 108 |
elif (( $modnames[(I)$words[2]] )); then |
| 109 |
if [[ "$words[2]" == (env|binutils|kernel|ctags|profile|fontconfig|opengl|vi) ]]; then |
| 110 |
_eselect_$words[2] "$@" |
| 111 |
else |
| 112 |
- modopts=(${${${(M)${(f)"$(eselect --no-color $words[2] usage)"}## *}// */}// /}) |
| 113 |
+ modopts=(${${${(M)${(f)"$(eselect --color=no $words[2] usage)"}## *}// */}// /}) |
| 114 |
_arguments -s \ |
| 115 |
"*:portage:_values 'eselect $words[2] options' \$modopts[@]" && return 0 |
| 116 |
fi |
| 117 |
fi |
| 118 |
elif ((CURRENT >= 4)); then |
| 119 |
- if (( $words[(I)(--no-color|--no-colour)] )); then |
| 120 |
+ if (( $words[(I)(--color=no|--colour=no)] )); then |
| 121 |
if (( $modnames[(I)$words[3]] )); then |
| 122 |
if [[ "$words[3]" == (env|binutils|kernel|ctags|profile|fontconfig|opengl|vi) ]]; then |
| 123 |
_eselect_$words[3] "$@" |
| 124 |
else |
| 125 |
- modopts=(${${${${(M)${(f)"$(eselect --no-color $words[3] usage)"}## *}// */}// /}// *}) |
| 126 |
+ modopts=(${${${${(M)${(f)"$(eselect --color=no $words[3] usage)"}## *}// */}// /}// *}) |
| 127 |
_arguments -s \ |
| 128 |
"*:portage:_values 'eselect $words[3] options' \$modopts[@]" && return 0 |
| 129 |
fi |
Archives