Customization/powerlevel10k
1
0
Fork 0
mirror of https://github.com/romkatv/powerlevel10k.git synced 2024-11-21 20:00:07 +00:00
Code Releases Activity

zf_rm before zf_mv to work around NTFS bugs (see #610)

Browse source
This commit is contained in:
romkatv 2020-04-07 08:21:33 +02:00
parent da58ccbbaf
commit e1323716fe
3 changed files with 18 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/notes.md
View file

@ -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. Optimize auto-wizard check.
```text ```text

28
internal/p10k.zsh
View file

@ -1,4 +1,4 @@
if [[ $__p9k_sourced != 9 ]]; then if [[ $__p9k_sourced != 10 ]]; then
>&2 print -P "" >&2 print -P ""
>&2 print -P "[%F{1}ERROR%f]: Corrupted powerlevel10k installation." >&2 print -P "[%F{1}ERROR%f]: Corrupted powerlevel10k installation."
>&2 print -P "" >&2 print -P ""
@ -5551,7 +5551,7 @@ _p9k_set_instant_prompt() {
[[ -n $RPROMPT ]] || unset RPROMPT [[ -n $RPROMPT ]] || unset RPROMPT
} }
typeset -gri __p9k_instant_prompt_version=19 typeset -gri __p9k_instant_prompt_version=20
_p9k_dump_instant_prompt() { _p9k_dump_instant_prompt() {
local user=${(%):-%n} local user=${(%):-%n}
@ -5852,12 +5852,12 @@ _p9k_dump_instant_prompt() {
exec {fd}>&- exec {fd}>&-
} }
{ {
(( ! $? )) || return (( ! $? )) || return
zf_mv -f $tmp $root_file || return # `zf_mv -f src dst` fails on NTFS if `dst` is not writable, hence `zf_rm`.
zcompile -R -- $tmp.zwc $root_file || return zf_rm -f -- $root_file.zwc || return
# Error suppression is due to https://github.com/romkatv/powerlevel10k/issues/610. zf_mv -f -- $tmp $root_file || return
# I've no idea what actually happens there. zcompile -R -- $tmp.zwc $root_file || return
zf_mv -f -- $tmp.zwc $root_file.zwc 2>/dev/null || return zf_mv -f -- $tmp.zwc $root_file.zwc || return
} always { } always {
(( $? )) && zf_rm -f -- $tmp $tmp.zwc 2>/dev/null (( $? )) && zf_rm -f -- $tmp $tmp.zwc 2>/dev/null
} }
@ -5952,11 +5952,11 @@ function _p9k_dump_state() {
} always { } always {
exec {fd}>&- exec {fd}>&-
} }
zf_mv -f -- $tmp $__p9k_dump_file || return # `zf_mv -f src dst` fails on NTFS if `dst` is not writable, hence `zf_rm`.
zcompile -R -- $tmp.zwc $__p9k_dump_file || return zf_rm -f -- $__p9k_dump_file.zwc || return
# Error suppression is due to https://github.com/romkatv/powerlevel10k/issues/610. zf_mv -f -- $tmp $__p9k_dump_file || return
# I've no idea what actually happens there. zcompile -R -- $tmp.zwc $__p9k_dump_file || return
zf_mv -f -- $tmp.zwc $__p9k_dump_file.zwc 2>/dev/null || return zf_mv -f -- $tmp.zwc $__p9k_dump_file.zwc || return
} always { } always {
(( $? )) && zf_rm -f -- $tmp $tmp.zwc 2>/dev/null (( $? )) && zf_rm -f -- $tmp $tmp.zwc 2>/dev/null
} }
@ -7567,7 +7567,7 @@ _p9k_must_init() {
[[ $sig == $_p9k__param_sig ]] && return 1 [[ $sig == $_p9k__param_sig ]] && return 1
_p9k_deinit _p9k_deinit
fi 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+=$'${#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+=$'$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' _p9k__param_pat+=$'$DEFAULT_USER\1${ZLE_RPROMPT_INDENT:-1}\1$P9K_SSH\1$__p9k_ksh_arrays\1'

14
powerlevel10k.zsh-theme
View file

@ -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 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 _p9k_preinit
fi fi
typeset -gr __p9k_sourced=9 typeset -gr __p9k_sourced=10
if [[ $ZSH_VERSION == (5.<1->*|<6->.*) ]]; then if [[ $ZSH_VERSION == (5.<1->*|<6->.*) ]]; then
if [[ -w $__p9k_root_dir && -w $__p9k_root_dir/internal && -w $__p9k_root_dir/gitstatus ]]; then if [[ -w $__p9k_root_dir && -w $__p9k_root_dir/internal && -w $__p9k_root_dir/gitstatus ]]; then
local f local f
@ -63,16 +63,10 @@ function _p9k_init_locale() {
zmodload -F zsh/files b:zf_mv b:zf_rm zmodload -F zsh/files b:zf_mv b:zf_rm
local tmp=$f.tmp.$$.zwc local tmp=$f.tmp.$$.zwc
{ {
# The first error suppression is a workaround for the bug in # `zf_mv -f src dst` fails on NTFS if `dst` is not writable, hence `zf_rm`.
# https://aur.archlinux.org/packages/zsh-theme-powerlevel10k-git/. zf_rm -f -- $f.zwc && zcompile -R -- $tmp $f && zf_mv -f -- $tmp $f.zwc
# 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
} always { } always {
(( $? )) && zf_rm -f -- $tmp 2>/dev/null (( $? )) && zf_rm -f -- $tmp
} }
done done
fi fi