diff options
| author | romkatv <roman.perepelitsa@gmail.com> | 2020-02-27 16:38:29 +0300 |
|---|---|---|
| committer | romkatv <roman.perepelitsa@gmail.com> | 2020-02-27 16:38:29 +0300 |
| commit | 112648acb106596cd14b0ba8bdccddc9ce4e5f4c (patch) | |
| tree | 18d2aac79b3fe02b92679df27d4c6049f768a48a /config/p10k-classic.zsh | |
| parent | 1fd5087e919d53e79d728861acb5b10d420a9777 (diff) | |
more robust locale workaround in configs
Diffstat (limited to 'config/p10k-classic.zsh')
| -rw-r--r-- | config/p10k-classic.zsh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/config/p10k-classic.zsh b/config/p10k-classic.zsh index b5df1e6f..f68ff457 100644 --- a/config/p10k-classic.zsh +++ b/config/p10k-classic.zsh @@ -13,8 +13,7 @@ 'builtin' 'setopt' 'no_aliases' 'no_sh_glob' 'brace_expand' () { - emulate -L zsh - setopt no_unset extended_glob + emulate -L zsh -o extended_glob # Unset all configuration options. This allows you to apply configiguration changes without # restarting zsh. Edit ~/.p10k.zsh and type `source ~/.p10k.zsh`. @@ -23,8 +22,11 @@ autoload -Uz is-at-least && is-at-least 5.1 || return zmodload zsh/langinfo - if [[ ${langinfo[CODESET]:-} != (utf|UTF)(-|)8 ]]; then - local LC_ALL=${${(@M)$(locale -a):#*.(utf|UTF)(-|)8}[1]:-en_US.UTF-8} + if [[ ${langinfo[CODESET]:-} != (utf|UTF)(-|)8 && $+commands[locale] == 1 ]]; then + local -a loc + if loc=(${(@M)$(locale -a 2>/dev/null):#*.(utf|UTF)(-|)8}) && (( $#loc )); then + local LC_ALL=${loc[(r)(#i)C.UTF(-|)8]:-${loc[(r)(#i)en_US.UTF(-|)8]:-$loc[1]}} + fi fi # The list of segments shown on the left. Fill it with the most important segments. |