From b2667b8270fa103eb6558ef719fb872fec0fc51b Mon Sep 17 00:00:00 2001 From: romkatv Date: Sun, 5 Apr 2020 06:54:20 +0200 Subject: [PATCH] don't compile sources if zsh is < 5.1 --- internal/p10k.zsh | 2 +- powerlevel10k.zsh-theme | 28 +++++++++++++++------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/internal/p10k.zsh b/internal/p10k.zsh index d58b533b..50654ba2 100644 --- a/internal/p10k.zsh +++ b/internal/p10k.zsh @@ -1,4 +1,4 @@ -if [[ $__p9k_sourced != 7 ]]; then +if [[ $__p9k_sourced != 8 ]]; then >&2 print -P "" >&2 print -P "[%F{1}ERROR%f]: Corrupted powerlevel10k installation." >&2 print -P "" diff --git a/powerlevel10k.zsh-theme b/powerlevel10k.zsh-theme index 0e4cc5cd..90b19657 100644 --- a/powerlevel10k.zsh-theme +++ b/powerlevel10k.zsh-theme @@ -54,19 +54,21 @@ function _p9k_init_locale() { if [[ $__p9k_dump_file != $__p9k_instant_prompt_dump_file ]] && (( ! $+functions[_p9k_preinit] )) && source $__p9k_dump_file 2>/dev/null && (( $+functions[_p9k_preinit] )); then _p9k_preinit fi - typeset -gr __p9k_sourced=7 - if [[ -w $__p9k_root_dir && -w $__p9k_root_dir/internal && -w $__p9k_root_dir/gitstatus ]]; then - local f - for f in $__p9k_root_dir/{powerlevel9k.zsh-theme,powerlevel10k.zsh-theme,internal/p10k.zsh,internal/icons.zsh,internal/configure.zsh,internal/worker.zsh,internal/parser.zsh,gitstatus/gitstatus.plugin.zsh}; do - [[ $f.zwc -nt $f ]] && continue - zmodload -F zsh/files b:zf_mv b:zf_rm - local tmp=$f.tmp.$$.zwc - { - zcompile -R -- $tmp $f && zf_mv -f -- $tmp $f.zwc - } always { - (( $? )) && zf_rm -f -- $tmp - } - done + typeset -gr __p9k_sourced=8 + if [[ $ZSH_VERSION == (5.<1->*|<6->.*) ]]; then + if [[ -w $__p9k_root_dir && -w $__p9k_root_dir/internal && -w $__p9k_root_dir/gitstatus ]]; then + local f + for f in $__p9k_root_dir/{powerlevel9k.zsh-theme,powerlevel10k.zsh-theme,internal/p10k.zsh,internal/icons.zsh,internal/configure.zsh,internal/worker.zsh,internal/parser.zsh,gitstatus/gitstatus.plugin.zsh}; do + [[ $f.zwc -nt $f ]] && continue + zmodload -F zsh/files b:zf_mv b:zf_rm + local tmp=$f.tmp.$$.zwc + { + zcompile -R -- $tmp $f && zf_mv -f -- $tmp $f.zwc + } always { + (( $? )) && zf_rm -f -- $tmp + } + done + fi fi source $__p9k_root_dir/internal/p10k.zsh || true }