linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-06 02:51:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ohmyzsh:master' into omz-subexecutor

Browse source
This commit is contained in:
Pandu E POLUAN 2024-04-23 14:37:01 +07:00 • committed by GitHub
commit 4c7cbfeebc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/async_prompt.zsh
View file

@ -124,7 +124,7 @@ function _omz_async_callback() {
# Repaint prompt if output has changed # Repaint prompt if output has changed
if [[ "$old_output" != "${_OMZ_ASYNC_OUTPUT[$handler]}" ]]; then if [[ "$old_output" != "${_OMZ_ASYNC_OUTPUT[$handler]}" ]]; then
zle reset-prompt zle .reset-prompt
zle -R zle -R
fi fi

16
lib/git.zsh
View file

@ -39,21 +39,17 @@ function _omz_git_prompt_info() {
echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${ref:gs/%/%%}${upstream:gs/%/%%}$(parse_git_dirty)${ZSH_THEME_GIT_PROMPT_SUFFIX}" echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${ref:gs/%/%%}${upstream:gs/%/%%}$(parse_git_dirty)${ZSH_THEME_GIT_PROMPT_SUFFIX}"
} }
# Use async version if setting is enabled, or undefined but zsh version is at least 5.0.6 # Use async version if setting is enabled or undefined
# https://github.com/ohmyzsh/ohmyzsh/issues/12331#issuecomment-2059460268 if zstyle -T ':omz:alpha:lib:git' async-prompt; then
if zstyle -t ':omz:alpha:lib:git' async-prompt \
|| { is-at-least 5.0.6 && zstyle -T ':omz:alpha:lib:git' async-prompt }; then
function git_prompt_info() { function git_prompt_info() {
setopt localoptions noksharrays if [[ -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_info]}" ]]; then
if [[ -n "$_OMZ_ASYNC_OUTPUT[_omz_git_prompt_info]" ]]; then echo -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_info]}"
echo -n "$_OMZ_ASYNC_OUTPUT[_omz_git_prompt_info]"
fi fi
} }
function git_prompt_status() { function git_prompt_status() {
setopt localoptions noksharrays if [[ -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_status]}" ]]; then
if [[ -n "$_OMZ_ASYNC_OUTPUT[_omz_git_prompt_status]" ]]; then echo -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_status]}"
echo -n "$_OMZ_ASYNC_OUTPUT[_omz_git_prompt_status]"
fi fi
} }

12
plugins/fzf/fzf.plugin.zsh
View file

@ -1,3 +1,12 @@
function fzf_setup_using_fzf() {
(( ${+commands[fzf]} )) || return 1
local fzf_ver=${$(fzf --version)[1]}
is-at-least 0.48.0 $fzf_ver || return 1
eval "$(fzf --zsh)"
}
function fzf_setup_using_base_dir() { function fzf_setup_using_base_dir() {
local fzf_base fzf_shell fzfdirs dir local fzf_base fzf_shell fzfdirs dir
@ -217,7 +226,8 @@ Please add `export FZF_BASE=/path/to/fzf/install/dir` to your .zshrc
EOF EOF
} }
fzf_setup_using_openbsd \ fzf_setup_using_fzf \
|| fzf_setup_using_openbsd \
|| fzf_setup_using_debian \ || fzf_setup_using_debian \
|| fzf_setup_using_opensuse \ || fzf_setup_using_opensuse \
|| fzf_setup_using_cygwin \ || fzf_setup_using_cygwin \

2
plugins/ssh-agent/ssh-agent.plugin.zsh
View file

@ -62,7 +62,7 @@ function _add_identities() {
# if id is an absolute path, make file equal to id # if id is an absolute path, make file equal to id
[[ "$id" = /* ]] && file="$id" || file="$HOME/.ssh/$id" [[ "$id" = /* ]] && file="$id" || file="$HOME/.ssh/$id"
# check for filename match, otherwise try for signature match # check for filename match, otherwise try for signature match
if [[ ${loaded_ids[(I)$file]} -le 0 ]]; then if [[ -f $file && ${loaded_ids[(I)$file]} -le 0 ]]; then
sig="$(ssh-keygen -lf "$file" | awk '{print $2}')" sig="$(ssh-keygen -lf "$file" | awk '{print $2}')"
[[ ${loaded_sigs[(I)$sig]} -le 0 ]] && not_loaded+=("$file") [[ ${loaded_sigs[(I)$sig]} -le 0 ]] && not_loaded+=("$file")
fi fi