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 version logic for major version > 0

This commit is contained in:
Viktor Haag 2016-12-01 13:59:27 -05:00
parent 50cb5d1196
commit febd404323
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/_ag
View File

@ -40,7 +40,7 @@
# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*- # -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
# vim: ft=zsh sw=2 ts=2 et # vim: ft=zsh sw=2 ts=2 et
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
_ag_version() { _ag_minor_version() {
local version local version
version=( $($words[1] --version) ) version=( $($words[1] --version) )
version=${version[@]:2:1} version=${version[@]:2:1}
@ -48,6 +48,15 @@ _ag_version() {
echo "${version[2]}" echo "${version[2]}"
} }
_ag_major_version() {
local version
version=( $($words[1] --version) )
version=${version[@]:2:1}
version=( "${(@s/./)version}" )
echo "${version[1]}"
}
# Dynamically build the file type completion # Dynamically build the file type completion
# Modifies the global $AG_OPTS array # Modifies the global $AG_OPTS array
_ag_add_file_types() { _ag_add_file_types() {
@ -69,9 +78,10 @@ _ag_add_file_types() {
# Add version appropriate options above base # Add version appropriate options above base
# Modifies the global $AG_OPTS array # Modifies the global $AG_OPTS array
_ag_add_version_opts() { _ag_add_version_opts() {
local minor=$(_ag_version) local minor=$(_ag_minor_version)
local major=$(_ag_major_version)
if [[ $minor -gt 21 ]];then if [[ $major -ge 1 || $minor -gt 21 ]];then
_ag_add_file_types _ag_add_file_types
AG_OPTS+=( AG_OPTS+=(
'(- 1 *)--list-file-types[list supported filetypes to search]' '(- 1 *)--list-file-types[list supported filetypes to search]'
@ -79,19 +89,19 @@ _ag_add_version_opts() {
) )
fi fi
if [[ $minor -gt 22 ]];then if [[ $major -ge 1 || $minor -gt 22 ]];then
AG_OPTS+=( AG_OPTS+=(
'(-z --search-zip)'{-z,--search-zip}'[search contents of compressed files]' '(-z --search-zip)'{-z,--search-zip}'[search contents of compressed files]'
) )
fi fi
if [[ $minor -le 24 ]];then if [[ $major -lt 1 && $minor -le 24 ]];then
AG_OPTS+=( AG_OPTS+=(
'(-s --case-sensitive)'{-s,--case-sensitive}'[match case sensitively]' '(-s --case-sensitive)'{-s,--case-sensitive}'[match case sensitively]'
'(--noheading --heading)'{--noheading,--heading}'[print file names above matching contents]' '(--noheading --heading)'{--noheading,--heading}'[print file names above matching contents]'
) )
fi fi
if [[ $minor -gt 24 ]];then if [[ $major -ge 1 || $minor -gt 24 ]];then
AG_OPTS+=( AG_OPTS+=(
'(-s --case-sensitive)'{-s,--case-sensitive}'[Match case sensitively. Default on.]' '(-s --case-sensitive)'{-s,--case-sensitive}'[Match case sensitively. Default on.]'
'(-H --noheading --heading)'{-H,--noheading,--heading}'[print file names above matching contents]' '(-H --noheading --heading)'{-H,--noheading,--heading}'[print file names above matching contents]'
@ -99,18 +109,18 @@ _ag_add_version_opts() {
) )
fi fi
if [[ $minor -gt 26 ]];then if [[ $major -ge 1 || $minor -gt 26 ]];then
AG_OPTS+=( AG_OPTS+=(
'(-0 --null --print0)'{-0,--null,--print0}'[separate the filenames with \\0, rather than \\n]' '(-0 --null --print0)'{-0,--null,--print0}'[separate the filenames with \\0, rather than \\n]'
) )
fi fi
if [[ $minor -le 27 ]];then if [[ $major -lt 1 && $minor -le 27 ]];then
AG_OPTS+=( AG_OPTS+=(
'--depth[Search up to NUM directories deep. Default is 25.]:number' '--depth[Search up to NUM directories deep. Default is 25.]:number'
) )
fi fi
if [[ $minor -gt 27 ]];then if [[ $major -ge 1 || $minor -gt 27 ]];then
AG_OPTS+=( AG_OPTS+=(
'(-c --count)'{-c,--count}'[only print the number of matches in each file]' '(-c --count)'{-c,--count}'[only print the number of matches in each file]'
'--depth[Search up to NUM directories deep, -1 for unlimited. Default is 25.]:number' '--depth[Search up to NUM directories deep, -1 for unlimited. Default is 25.]:number'
@ -118,12 +128,12 @@ _ag_add_version_opts() {
) )
fi fi
if [[ $minor -le 28 ]];then if [[ $major -lt 1 && $minor -le 28 ]];then
AG_OPTS+=( AG_OPTS+=(
'(--no-numbers)--no-numbers[don´t show line numbers]' '(--no-numbers)--no-numbers[don´t show line numbers]'
) )
fi fi
if [[ $minor -gt 28 ]];then if [[ $major -ge 1 || $minor -gt 28 ]];then
AG_OPTS+=( AG_OPTS+=(
'(--nofilename --filename)'{--nofilename,--filename}'[Print file names. Default on, except when searching a single file.]' '(--nofilename --filename)'{--nofilename,--filename}'[Print file names. Default on, except when searching a single file.]'
'(--nonumbers --numbers)'{--nonumbers,--numbers}'[Print line numbers. Default is to omit line numbers when searching streams]' '(--nonumbers --numbers)'{--nonumbers,--numbers}'[Print line numbers. Default is to omit line numbers when searching streams]'