mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-11 00:10:08 +00:00
lib: fix fmt removing ESC characters in theme and plugin list CLI commands
This commit is contained in:
parent
4cd5f7f920
commit
982d010be5
1 changed files with 24 additions and 20 deletions
12
lib/cli.zsh
12
lib/cli.zsh
|
@ -134,10 +134,11 @@ function _omz::plugin::list {
|
|||
custom_plugins=("$ZSH_CUSTOM"/plugins/*(/N:t))
|
||||
builtin_plugins=("$ZSH"/plugins/*(/N:t))
|
||||
|
||||
{
|
||||
(( ${#custom_plugins} )) && {
|
||||
print -Pn "%U%BCustom plugins%b%u: "
|
||||
print -l ${(q-)custom_plugins}
|
||||
} | fmt -w $COLUMNS
|
||||
}
|
||||
|
||||
(( ${#builtin_plugins} )) && {
|
||||
# add a line of separation
|
||||
|
@ -145,7 +146,8 @@ function _omz::plugin::list {
|
|||
|
||||
print -Pn "%U%BBuilt-in plugins%b%u: "
|
||||
print -l ${(q-)builtin_plugins}
|
||||
} | fmt -w $COLUMNS
|
||||
}
|
||||
} | fmt -w $COLUMNS | sed -E $'s/\e?(\\[[0-9]*m)/\e\\1/g' # deal with fmt removing ESC
|
||||
}
|
||||
|
||||
function _omz::pr {
|
||||
|
@ -305,10 +307,11 @@ function _omz::theme::list {
|
|||
custom_themes=("$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
|
||||
builtin_themes=("$ZSH"/themes/*.zsh-theme(.N:t:r))
|
||||
|
||||
{
|
||||
(( ${#custom_themes} )) && {
|
||||
print -Pn "%U%BCustom themes%b%u: "
|
||||
print -l ${(q-)custom_themes}
|
||||
} | fmt -w $COLUMNS
|
||||
}
|
||||
|
||||
(( ${#builtin_themes} )) && {
|
||||
# add a line of separation
|
||||
|
@ -316,7 +319,8 @@ function _omz::theme::list {
|
|||
|
||||
print -Pn "%U%BBuilt-in themes%b%u: "
|
||||
print -l ${(q-)builtin_themes}
|
||||
} | fmt -w $COLUMNS
|
||||
}
|
||||
} | fmt -w $COLUMNS | sed -E $'s/\e?(\\[[0-9]*m)/\e\\1/g' # deal with fmt removing ESC
|
||||
}
|
||||
|
||||
function _omz::theme::use {
|
||||
|
|
Loading…
Reference in a new issue