mirror of
https://github.com/romkatv/powerlevel10k.git
synced 2024-12-24 16:11:57 +00:00
Merge branch 'master' into worker
This commit is contained in:
commit
0d8a51bcf3
2 changed files with 6 additions and 5 deletions
|
@ -3,9 +3,10 @@ typeset -gr __p9k_wizard_lines=21
|
|||
typeset -gr __p9k_zd=${ZDOTDIR:-$HOME}
|
||||
typeset -gr __p9k_zd_u=${${${(q)__p9k_zd}/#(#b)${(q)HOME}(|\/*)/'~'$match[1]}//\%/%%}
|
||||
typeset -gr __p9k_cfg_basename=.p10k.zsh
|
||||
typeset -gr __p9k_cfg_path=$__p9k_zd/$__p9k_cfg_basename
|
||||
typeset -gr __p9k_cfg_path_o=$__p9k_zd/$__p9k_cfg_basename
|
||||
typeset -gr __p9k_cfg_path=${__p9k_cfg_path_o:A}
|
||||
typeset -gr __p9k_cfg_path_u=$__p9k_zd_u/$__p9k_cfg_basename
|
||||
typeset -gr __p9k_zshrc=$__p9k_zd/.zshrc
|
||||
typeset -gr __p9k_zshrc=${${:-$__p9k_zd/.zshrc}:A}
|
||||
typeset -gr __p9k_zshrc_u=$__p9k_zd_u/.zshrc
|
||||
typeset -gr __p9k_root_dir_u=${${${(q)__p9k_root_dir}/#(#b)${(q)HOME}(|\/*)/'~'$match[1]}//\%/%%}
|
||||
|
||||
|
@ -61,7 +62,7 @@ function _p9k_can_configure() {
|
|||
|
||||
function p9k_configure() {
|
||||
emulate -L zsh
|
||||
setopt no_hist_expand extended_glob
|
||||
setopt no_hist_expand extended_glob no_prompt_bang prompt_{percent,subst} no_aliases
|
||||
(
|
||||
set -- -f
|
||||
source $__p9k_root_dir/internal/wizard.zsh
|
||||
|
|
|
@ -1410,12 +1410,12 @@ function ask_zshrc_edit() {
|
|||
if [[ -e $__p9k_zshrc ]]; then
|
||||
zshrc_content="$(<$__p9k_zshrc)" || quit -c
|
||||
local lines=(${(f)zshrc_content})
|
||||
local f0=$__p9k_cfg_path
|
||||
local f0=$__p9k_cfg_path_o
|
||||
local f1=${(q)f0}
|
||||
local f2=${(q-)f0}
|
||||
local f3=${(qq)f0}
|
||||
local f4=${(qqq)f0}
|
||||
local g1=${${(q)__p9k_cfg_path}/#(#b)${(q)HOME}\//'~/'}
|
||||
local g1=${${(q)__p9k_cfg_path_o}/#(#b)${(q)HOME}\//'~/'}
|
||||
if [[ -n ${(@M)lines:#(#b)[^#]#([^[:IDENT:]]|)source[[:space:]]##($f1|$f2|$f3|$f4|$g1)(|[[:space:]]*|'#'*)} ]]; then
|
||||
zshrc_has_cfg=1
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue