mirrors/ohmyzsh-mirror
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-13 05:59:46 +08:00
Code Issues Releases Wiki Activity

Compare commits

base: mirrors:8cbe98469d9862d37d43ca4229dc8e915ec377a9
Branches Tags
mirrors:master
mirrors:update/plugins/kube-ps1/9b41c091
mirrors:update/plugins/history-substring-search/14c8d2e0
...
compare: mirrors:54779e5250f362ebd1cf6a7094657f2c894958c3
Branches Tags
mirrors:master
mirrors:update/plugins/kube-ps1/9b41c091
mirrors:update/plugins/history-substring-search/14c8d2e0

3 Commits
8cbe98469d ... 54779e5250

Author SHA1 Message Date
Matthias Heyman
54779e5250
fix(jira): support identifiers delimited with a hyphen (#11782) 
Co-authored-by: Matthias Heyman <matthias.heyman@ebo-enterprises.com>
 2023-06-29 13:29:14 +02:00
Andrei Polushin
73c4764e78
fix(docker): use docker --version instead of docker version 
`docker version` subcommand is able to return both docker client and
docker daemon information.  To get a daemon version, it connects to a
possibly remote daemon.  If the remote daemon is not accessible, the
client waits for some time, until it gets interrupted by timeout.

As a result we can have a docker client running in background. When zsh
session is rather short, a terminal application (iTerm2) starts asking
if that background docker process should be stopped.

On the other hand, to get a docker client version only, we can use
`docker --version` instead. It does not connect to a daemon.

Closes #11780
 2023-06-29 13:26:08 +02:00
Carlo Sala
723af07a56
fix(docker): add static completion script 2023-06-29 13:25:05 +02:00
3 changed files with 3136 additions and 2 deletions
Show Stats Expand all files Collapse all files

3126
plugins/docker/_docker Normal file
View File

File diff suppressed because it is too large Load Diff

4
plugins/docker/docker.plugin.zsh
View File

@ -37,8 +37,10 @@ if (( ! $+commands[docker] )); then
fi fi
{ {
# docker version returns `Docker version 24.0.2, build cb74dfcd85`
# with `s:,:` remove the comma after the version, and select third word of it
local _docker_version=${${(s:,:z)"$(command docker --version)"}[3]}
# `docker completion` is only available from 23.0.0 on # `docker completion` is only available from 23.0.0 on
local _docker_version=$(command docker version --format '{{.Client.Version}}' 2>/dev/null)
if is-at-least 23.0.0 $_docker_version; then if is-at-least 23.0.0 $_docker_version; then
# If the completion file doesn't exist yet, we need to autoload it and # If the completion file doesn't exist yet, we need to autoload it and
# bind it to `docker`. Otherwise, compinit will have already done that. # bind it to `docker`. Otherwise, compinit will have already done that.

6
plugins/jira/jira.plugin.zsh
View File

@ -80,7 +80,13 @@ function jira() {
issue_arg=${issue_arg##*/} issue_arg=${issue_arg##*/}
# Strip suffixes starting with _ # Strip suffixes starting with _
issue_arg=(${(s:_:)issue_arg}) issue_arg=(${(s:_:)issue_arg})
# If there is only one part, it means that there is a different delimiter. Try with -
if [[ ${#issue_arg[@]} = 1 && ${issue_arg} == *-* ]]; then
issue_arg=(${(s:-:)issue_arg})
issue_arg="${issue_arg[1]}-${issue_arg[2]}"
else
issue_arg=${issue_arg[1]} issue_arg=${issue_arg[1]}
fi
if [[ "${issue_arg:l}" = ${jira_prefix:l}* ]]; then if [[ "${issue_arg:l}" = ${jira_prefix:l}* ]]; then
issue="${issue_arg}" issue="${issue_arg}"
else else