diff options
| author | romkatv <roman.perepelitsa@gmail.com> | 2019-08-05 11:37:04 +0300 |
|---|---|---|
| committer | romkatv <roman.perepelitsa@gmail.com> | 2019-08-05 11:37:04 +0300 |
| commit | f62d1d5ae3f08c24fb002d25bc3ea1b1d5b782b8 (patch) | |
| tree | b4cd045571044734f7706c941bbcb3bf718e36cf /internal/configure.zsh | |
| parent | 7565d00218a3897034a1e0078738806a530db30d (diff) | |
speciazled diagnostics for i686; more escapes; more opts
Diffstat (limited to 'internal/configure.zsh')
| -rw-r--r-- | internal/configure.zsh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/internal/configure.zsh b/internal/configure.zsh index 4dc8de1c..1c69fa85 100644 --- a/internal/configure.zsh +++ b/internal/configure.zsh @@ -1,26 +1,28 @@ typeset -gr __p9k_wizard_columns=76 typeset -gr __p9k_wizard_lines=21 typeset -gr __p9k_zd=${${ZDOTDIR:-$HOME}:A} -typeset -gr __p9k_zd_u=${${(q-)__p9k_zd}/#(#b)$HOME(|\/*)/'~'$match[1]} +typeset -gr __p9k_zd_u=${${${(q-)__p9k_zd}/#(#b)$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_u=$__p9k_zd_u/$__p9k_cfg_basename typeset -gr __p9k_zshrc=$__p9k_zd/.zshrc typeset -gr __p9k_zshrc_u=$__p9k_zd_u/.zshrc -typeset -gr __p9k_root_dir_u=${${(q-)__p9k_root_dir}/#(#b)$HOME(|\/*)/'~'$match[1]} +typeset -gr __p9k_root_dir_u=${${${(q-)__p9k_root_dir}/#(#b)$HOME(|\/*)/'~'$match[1]}//\%/%%} function _p9k_can_configure() { emulate -L zsh setopt err_return extended_glob no_prompt_{bang,subst} prompt_{cr,percent,sp} [[ $1 == '-q' ]] && local -i q=1 || local -i q=0 function $0_error() { - (( q )) || print -P "%1F[ERROR]%f %Bp10k configure%b: $1" >&2 + (( q )) || print -rP "%1F[ERROR]%f %Bp10k configure%b: $1" >&2 return 1 } { [[ -t 0 && -t 1 ]] || $0_error "no TTY" [[ -o multibyte ]] || $0_error "multibyte option is not set" - [[ "${#$(print -P '\u276F' 2>/dev/null)}" == 1 ]] || $0_error "shell doesn't support unicode" + [[ "${#$(print '\u276F' 2>/dev/null)}" == 1 ]] || $0_error "shell doesn't support unicode" + [[ -e $__p9k_zd ]] || $0_error "$__p9k_zd_u does not exist" + [[ -d $__p9k_zd ]] || $0_error "$__p9k_zd_u is not a directory" [[ -w $__p9k_zd ]] || $0_error "$__p9k_zd_u is not writable" [[ ! -d $__p9k_cfg_path ]] || $0_error "$__p9k_cfg_path_u is a directory" [[ ! -d $__p9k_zshrc ]] || $0_error "$__p9k_zshrc_u is a directory" |