diff options
| author | romkatv <roman.perepelitsa@gmail.com> | 2020-05-14 12:24:30 +0300 |
|---|---|---|
| committer | romkatv <roman.perepelitsa@gmail.com> | 2020-05-14 12:24:30 +0300 |
| commit | 574754eaf6132467516a0ad85b5142e16890c533 (patch) | |
| tree | f4b22d8bdfe1c6856d36bf9e48f18649c0a1ae9f /internal/p10k.zsh | |
| parent | 7e6abbb89174f1347c1f5bbe0b52204ec8b8b6b2 (diff) | |
abort instant prompt if wizard needs to run on startup
Diffstat (limited to 'internal/p10k.zsh')
| -rw-r--r-- | internal/p10k.zsh | 47 |
1 files changed, 28 insertions, 19 deletions
diff --git a/internal/p10k.zsh b/internal/p10k.zsh index ff7f0c4f..2153309c 100644 --- a/internal/p10k.zsh +++ b/internal/p10k.zsh @@ -6333,25 +6333,34 @@ _p9k_precmd_impl() { __p9k_configured=1 if [[ -z "${parameters[(I)POWERLEVEL9K_*~(POWERLEVEL9K_MODE|POWERLEVEL9K_CONFIG_FILE)]}" ]]; then _p9k_can_configure -q - case $? in - 0) - ( - source "$__p9k_root_dir"/internal/wizard.zsh - ) - if (( $? )); then - instant_prompt_disabled=1 - else - source "$__p9k_cfg_path" - _p9k__force_must_init=1 - _p9k_must_init - fi - ;; - 2) - _p9k_delete_instant_prompt - zf_rm -f -- $__p9k_dump_file{,.zwc} 2>/dev/null + local -i ret=$? + if (( ret == 2 && $+__p9k_instant_prompt_active )); then + _p9k_clear_instant_prompt + unset __p9k_instant_prompt_active + _p9k_delete_instant_prompt + zf_rm -f -- $__p9k_dump_file{,.zwc} 2>/dev/null + () { + local key + while true; do + [[ -t 2 ]] + read -t0 -k key || break + done 2>/dev/null + } + _p9k_can_configure -q + ret=$? + fi + if (( ret == 0 )); then + ( + source "$__p9k_root_dir"/internal/wizard.zsh + ) + if (( $? )); then instant_prompt_disabled=1 - ;; - esac + else + source "$__p9k_cfg_path" + _p9k__force_must_init=1 + _p9k_must_init + fi + fi fi fi _p9k_init @@ -7985,7 +7994,7 @@ _p9k_init() { _p9k_init_vcs - if (( _POWERLEVEL9K_DISABLE_INSTANT_PROMPT )); then + if (( _p9k__instant_prompt_disabled )); then unset __p9k_instant_prompt_erased _p9k_delete_instant_prompt _p9k_dumped_instant_prompt_sigs=() |