diff options
| -rw-r--r-- | internal/notes.md | 6 | ||||
| -rw-r--r-- | internal/p10k.zsh | 28 | ||||
| -rw-r--r-- | powerlevel10k.zsh-theme | 14 |
3 files changed, 18 insertions, 30 deletions
diff --git a/internal/notes.md b/internal/notes.md index 9f56b096..39a3362f 100644 --- a/internal/notes.md +++ b/internal/notes.md @@ -212,12 +212,6 @@ There are two prompt questions that don't fit this pattern: `ask_empty_line` and --- -Revert `3ef4e68b5fdae654f323af644cbca40f27a8ab97`. Instead of it use `zf_rm -f -- $dst` before -`zf_mv -f -- $src $dst`. `zwc` files are readonly and `zf_mv` fails on NTFS if the target file -exists and is readonly. - ---- - Optimize auto-wizard check. ```text diff --git a/internal/p10k.zsh b/internal/p10k.zsh index c15f088b..8d405991 100644 --- a/internal/p10k.zsh +++ b/internal/p10k.zsh @@ -1,4 +1,4 @@ -if [[ $__p9k_sourced != 9 ]]; then +if [[ $__p9k_sourced != 10 ]]; then >&2 print -P "" >&2 print -P "[%F{1}ERROR%f]: Corrupted powerlevel10k installation." >&2 print -P "" @@ -5551,7 +5551,7 @@ _p9k_set_instant_prompt() { [[ -n $RPROMPT ]] || unset RPROMPT } -typeset -gri __p9k_instant_prompt_version=19 +typeset -gri __p9k_instant_prompt_version=20 _p9k_dump_instant_prompt() { local user=${(%):-%n} @@ -5852,12 +5852,12 @@ _p9k_dump_instant_prompt() { exec {fd}>&- } { - (( ! $? )) || return - zf_mv -f $tmp $root_file || return - zcompile -R -- $tmp.zwc $root_file || return - # Error suppression is due to https://github.com/romkatv/powerlevel10k/issues/610. - # I've no idea what actually happens there. - zf_mv -f -- $tmp.zwc $root_file.zwc 2>/dev/null || return + (( ! $? )) || return + # `zf_mv -f src dst` fails on NTFS if `dst` is not writable, hence `zf_rm`. + zf_rm -f -- $root_file.zwc || return + zf_mv -f -- $tmp $root_file || return + zcompile -R -- $tmp.zwc $root_file || return + zf_mv -f -- $tmp.zwc $root_file.zwc || return } always { (( $? )) && zf_rm -f -- $tmp $tmp.zwc 2>/dev/null } @@ -5952,11 +5952,11 @@ function _p9k_dump_state() { } always { exec {fd}>&- } - zf_mv -f -- $tmp $__p9k_dump_file || return - zcompile -R -- $tmp.zwc $__p9k_dump_file || return - # Error suppression is due to https://github.com/romkatv/powerlevel10k/issues/610. - # I've no idea what actually happens there. - zf_mv -f -- $tmp.zwc $__p9k_dump_file.zwc 2>/dev/null || return + # `zf_mv -f src dst` fails on NTFS if `dst` is not writable, hence `zf_rm`. + zf_rm -f -- $__p9k_dump_file.zwc || return + zf_mv -f -- $tmp $__p9k_dump_file || return + zcompile -R -- $tmp.zwc $__p9k_dump_file || return + zf_mv -f -- $tmp.zwc $__p9k_dump_file.zwc || return } always { (( $? )) && zf_rm -f -- $tmp $tmp.zwc 2>/dev/null } @@ -7567,7 +7567,7 @@ _p9k_must_init() { [[ $sig == $_p9k__param_sig ]] && return 1 _p9k_deinit fi - _p9k__param_pat=$'v77\1'${ZSH_VERSION}$'\1'${ZSH_PATCHLEVEL}$'\1' + _p9k__param_pat=$'v78\1'${ZSH_VERSION}$'\1'${ZSH_PATCHLEVEL}$'\1' _p9k__param_pat+=$'${#parameters[(I)POWERLEVEL9K_*]}\1${(%):-%n%#}\1$GITSTATUS_LOG_LEVEL\1' _p9k__param_pat+=$'$GITSTATUS_ENABLE_LOGGING\1$GITSTATUS_DAEMON\1$GITSTATUS_NUM_THREADS\1' _p9k__param_pat+=$'$DEFAULT_USER\1${ZLE_RPROMPT_INDENT:-1}\1$P9K_SSH\1$__p9k_ksh_arrays\1' diff --git a/powerlevel10k.zsh-theme b/powerlevel10k.zsh-theme index d1fbd95e..d8a30ba0 100644 --- a/powerlevel10k.zsh-theme +++ b/powerlevel10k.zsh-theme @@ -54,7 +54,7 @@ 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=9 + typeset -gr __p9k_sourced=10 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 @@ -63,16 +63,10 @@ function _p9k_init_locale() { zmodload -F zsh/files b:zf_mv b:zf_rm local tmp=$f.tmp.$$.zwc { - # The first error suppression is a workaround for the bug in - # https://aur.archlinux.org/packages/zsh-theme-powerlevel10k-git/. - # This package misses some source files. - # - # The second error suppression is due to - # https://github.com/romkatv/powerlevel10k/issues/610. - # I've no idea what actually happens there. - zcompile -R -- $tmp $f 2>/dev/null && zf_mv -f -- $tmp $f.zwc 2>/dev/null + # `zf_mv -f src dst` fails on NTFS if `dst` is not writable, hence `zf_rm`. + zf_rm -f -- $f.zwc && zcompile -R -- $tmp $f && zf_mv -f -- $tmp $f.zwc } always { - (( $? )) && zf_rm -f -- $tmp 2>/dev/null + (( $? )) && zf_rm -f -- $tmp } done fi |