linux/powerlevel10k
0
0
Fork 0
mirror of https://github.com/romkatv/powerlevel10k.git synced 2024-09-19 03:51:22 +02:00
Code Issues Projects Releases Wiki Activity

move source guard to the outer script

Browse source
This commit is contained in:
romkatv 2019-06-01 22:54:32 +02:00
parent 99bc7f3c7f
commit 5e72d3ca80
2 changed files with 35 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
internal/p10k.zsh
View file

@ -27,13 +27,6 @@ if ! autoload -U is-at-least || ! is-at-least 5.1; then
return 1
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/icons.zsh"
source "${_p9k_installation_dir}/functions/colors.zsh"

58
powerlevel9k.zsh-theme
View file

@ -20,32 +20,44 @@
#zstyle ':vcs_info:*+*:*' debug true
#set -o xtrace
'builtin' 'typeset' "_p9k_aliases=$(
'builtin' 'alias' '-rL'
'builtin' 'alias' '-gL'
'builtin' 'alias' '-sL')"
() {
'builtin' 'emulate' '-L' 'zsh'
'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}
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'
{
if (( $+_p9k_sourced )); then
prompt_powerlevel9k_setup
return
fi
else
_p9k_installation_dir=${${(%):-%x}:A:h}
fi
fi
typeset -gr _p9k_sourced=1
typeset -g _p9k_installation_dir=''
[[ -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"
}
}