mirror of
https://github.com/romkatv/powerlevel10k.git
synced 2024-12-18 05:40:07 +00:00
move source guard to the outer script
This commit is contained in:
parent
99bc7f3c7f
commit
5e72d3ca80
2 changed files with 35 additions and 30 deletions
|
@ -27,13 +27,6 @@ if ! autoload -U is-at-least || ! is-at-least 5.1; then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if (( $+_P9K_SOURCED )); then
|
|
||||||
prompt_powerlevel9k_setup
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
readonly _P9K_SOURCED=1
|
|
||||||
|
|
||||||
source "${_p9k_installation_dir}/functions/utilities.zsh"
|
source "${_p9k_installation_dir}/functions/utilities.zsh"
|
||||||
source "${_p9k_installation_dir}/functions/icons.zsh"
|
source "${_p9k_installation_dir}/functions/icons.zsh"
|
||||||
source "${_p9k_installation_dir}/functions/colors.zsh"
|
source "${_p9k_installation_dir}/functions/colors.zsh"
|
||||||
|
|
|
@ -20,32 +20,44 @@
|
||||||
#zstyle ':vcs_info:*+*:*' debug true
|
#zstyle ':vcs_info:*+*:*' debug true
|
||||||
#set -o xtrace
|
#set -o xtrace
|
||||||
|
|
||||||
'builtin' 'typeset' "_p9k_aliases=$(
|
() {
|
||||||
'builtin' 'alias' '-rL'
|
'builtin' 'emulate' '-L' 'zsh'
|
||||||
'builtin' 'alias' '-gL'
|
|
||||||
'builtin' 'alias' '-sL')"
|
|
||||||
|
|
||||||
'builtin' 'unalias' '-m' '*'
|
'builtin' 'local' "_p9k_aliases=$(
|
||||||
|
'builtin' 'alias' '-rL'
|
||||||
|
'builtin' 'alias' '-gL'
|
||||||
|
'builtin' 'alias' '-sL')"
|
||||||
|
|
||||||
_p9k_installation_dir=''
|
'builtin' 'unalias' '-m' '*'
|
||||||
|
|
||||||
if [[ -n $POWERLEVEL9K_INSTALLATION_DIR ]]; then
|
{
|
||||||
_p9k_installation_dir=${POWERLEVEL9K_INSTALLATION_DIR:A}
|
if (( $+_p9k_sourced )); then
|
||||||
else
|
prompt_powerlevel9k_setup
|
||||||
if [[ ${(%):-%N} == '(eval)' ]]; then
|
return
|
||||||
if [[ $0 == '-antigen-load' && -r powerlevel9k.zsh-theme ]]; then
|
|
||||||
# Antigen uses eval to load things so it can change the plugin (!!)
|
|
||||||
# https://github.com/zsh-users/antigen/issues/581
|
|
||||||
_p9k_installation_dir=$PWD
|
|
||||||
else
|
|
||||||
>&2 print -P '%F{red}[ERROR]%f Powerlevel10k cannot figure out its installation directory.'
|
|
||||||
>&2 print -P 'Please set %F{green}POWERLEVEL9K_INSTALLATION_DIR.%f'
|
|
||||||
fi
|
fi
|
||||||
else
|
typeset -gr _p9k_sourced=1
|
||||||
_p9k_installation_dir=${${(%):-%x}:A:h}
|
typeset -g _p9k_installation_dir=''
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
[[ -n $_p9k_installation_dir ]] && source $_p9k_installation_dir/internal/p10k.zsh
|
if [[ -n $POWERLEVEL9K_INSTALLATION_DIR ]]; then
|
||||||
|
_p9k_installation_dir=${POWERLEVEL9K_INSTALLATION_DIR:A}
|
||||||
|
else
|
||||||
|
if [[ ${(%):-%N} == '(eval)' ]]; then
|
||||||
|
if [[ $0 == '-antigen-load' && -r powerlevel9k.zsh-theme ]]; then
|
||||||
|
# Antigen uses eval to load things so it can change the plugin (!!)
|
||||||
|
# https://github.com/zsh-users/antigen/issues/581
|
||||||
|
_p9k_installation_dir=$PWD
|
||||||
|
else
|
||||||
|
>&2 print -P '%F{red}[ERROR]%f Powerlevel10k cannot figure out its installation directory.'
|
||||||
|
>&2 print -P 'Please set %F{green}POWERLEVEL9K_INSTALLATION_DIR.%f'
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
_p9k_installation_dir=${${(%):-%x}:A:h}
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
eval "$_p9k_aliases"
|
source $_p9k_installation_dir/internal/p10k.zsh
|
||||||
|
} always {
|
||||||
|
eval "$_p9k_aliases"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue