Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Several cosmetic improvements in zsh completion 

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
This commit is contained in:
Steve Durrheimer 2015-07-13 18:57:17 +02:00 committed by Tibor Vass
parent 31c530fd42
commit 66c1b06bc4
1 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
contrib/completion/zsh/_docker
View File

@ -45,18 +45,18 @@ __docker_get_containers() {
shift
[[ $kind = (stopped|all) ]] && args=($args -a)
lines=(${(f)"$(_call_program commands docker $docker_options ps ${args})"})
lines=(${(f)"$(_call_program commands docker $docker_options ps $args)"})
# Parse header line to find columns
local i=1 j=1 k header=${lines[1]}
declare -A begin end
while (( $j < ${#header} - 1 )) {
i=$(( $j + ${${header[$j,-1]}[(i)[^ ]]} - 1))
j=$(( $i + ${${header[$i,-1]}[(i) ]} - 1))
k=$(( $j + ${${header[$j,-1]}[(i)[^ ]]} - 2))
begin[${header[$i,$(($j-1))]}]=$i
end[${header[$i,$(($j-1))]}]=$k
}
while (( j < ${#header} - 1 )); do
i=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 1 ))
j=$(( i + ${${header[$i,-1]}[(i) ]} - 1 ))
k=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 2 ))
begin[${header[$i,$((j-1))]}]=$i
end[${header[$i,$((j-1))]}]=$k
done
lines=(${lines[2,-1]})
# Container ID
@ -65,7 +65,7 @@ __docker_get_containers() {
for line in $lines; do
s="${line[${begin[CONTAINER ID]},${end[CONTAINER ID]}]%% ##}"
s="$s:${(l:15:: :::)${${line[${begin[CREATED]},${end[CREATED]}]/ ago/}%% ##}}"
s="$s, ${${${line[$begin[IMAGE],$end[IMAGE]]}/:/\\:}%% ##}"
s="$s, ${${${line[${begin[IMAGE]},${end[IMAGE]}]}/:/\\:}%% ##}"
if [[ ${line[${begin[STATUS]},${end[STATUS]}]} = Exit* ]]; then
stopped=($stopped $s)
else
@ -80,7 +80,7 @@ __docker_get_containers() {
names=(${(ps:,:)${${line[${begin[NAMES]},-1]}%% *}})
for name in $names; do
s="${name}:${(l:15:: :::)${${line[${begin[CREATED]},${end[CREATED]}]/ ago/}%% ##}}"
s="$s, ${${${line[$begin[IMAGE],$end[IMAGE]]}/:/\\:}%% ##}"
s="$s, ${${${line[${begin[IMAGE]},${end[IMAGE]}]}/:/\\:}%% ##}"
if [[ ${line[${begin[STATUS]},${end[STATUS]}]} = Exit* ]]; then
stopped=($stopped $s)
else
@ -151,10 +151,9 @@ __docker_search() {
_wanted dockersearch expl 'available images' compadd -a result
}
__docker_caching_policy()
{
oldp=( "$1"(Nmh+1) ) # 1 hour
(( $#oldp ))
__docker_caching_policy() {
oldp=( "$1(Nmh+1)" ) # 1 hour
(( ${#oldp} ))
}
@ -616,8 +615,9 @@ _docker () {
return
fi
local curcontext="$curcontext" state line ret=1
local curcontext="$curcontext" state line
typeset -A opt_args
integer ret=1
_arguments -C \
'--api-cors-header=-[Set CORS headers in the remote API]:CORS headers: ' \
@ -637,7 +637,7 @@ _docker () {
'--fixed-cidr-v6=-[IPv6 subnet for fixed IPs]:IPv6 subnet: ' \
'(-G --group)'{-G,--group=-}'[Group for the unix socket (default: docker)]:group:_groups' \
'(-g --graph)'{-g,--graph=-}'[Root of the Docker runtime (default: /var/lib/docker)]:PATH:_directories' \
'(-H --host)'{-H,--host=-}'[tcp://host:port to bind/connect to]:socket: ' \
'(-H --host)'{-H,--host=-}'[tcp://host:port to bind/connect to]:host: ' \
'(-h --help)'{-h,--help}'[Print usage]' \
'--icc[Enable inter-container communication]' \
'*--insecure-registry=-[Enable insecure registry communication]:registry: ' \
@ -666,10 +666,6 @@ _docker () {
'(-): :->command' \
'(-)*:: :->option-or-argument' && ret=0
if (( CURRENT == 1 )); then
fi
local counter=1
while [ $counter -lt ${#words} ]; do
case "${words[$counter]}" in