Commit 982d010b authored by Marc Cornellà's avatar Marc Cornellà
Browse files

lib: fix fmt removing ESC characters in theme and plugin list CLI commands

parent 4cd5f7f9
...@@ -134,18 +134,20 @@ function _omz::plugin::list { ...@@ -134,18 +134,20 @@ function _omz::plugin::list {
custom_plugins=("$ZSH_CUSTOM"/plugins/*(/N:t)) custom_plugins=("$ZSH_CUSTOM"/plugins/*(/N:t))
builtin_plugins=("$ZSH"/plugins/*(/N:t)) builtin_plugins=("$ZSH"/plugins/*(/N:t))
(( ${#custom_plugins} )) && { {
print -Pn "%U%BCustom plugins%b%u: " (( ${#custom_plugins} )) && {
print -l ${(q-)custom_plugins} print -Pn "%U%BCustom plugins%b%u: "
} | fmt -w $COLUMNS print -l ${(q-)custom_plugins}
}
(( ${#builtin_plugins} )) && {
# add a line of separation (( ${#builtin_plugins} )) && {
(( ${#custom_plugins} )) && echo # add a line of separation
(( ${#custom_plugins} )) && echo
print -Pn "%U%BBuilt-in plugins%b%u: "
print -l ${(q-)builtin_plugins} print -Pn "%U%BBuilt-in plugins%b%u: "
} | fmt -w $COLUMNS print -l ${(q-)builtin_plugins}
}
} | fmt -w $COLUMNS | sed -E $'s/\e?(\\[[0-9]*m)/\e\\1/g' # deal with fmt removing ESC
} }
function _omz::pr { function _omz::pr {
...@@ -305,18 +307,20 @@ function _omz::theme::list { ...@@ -305,18 +307,20 @@ function _omz::theme::list {
custom_themes=("$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::)) custom_themes=("$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
builtin_themes=("$ZSH"/themes/*.zsh-theme(.N:t:r)) builtin_themes=("$ZSH"/themes/*.zsh-theme(.N:t:r))
(( ${#custom_themes} )) && { {
print -Pn "%U%BCustom themes%b%u: " (( ${#custom_themes} )) && {
print -l ${(q-)custom_themes} print -Pn "%U%BCustom themes%b%u: "
} | fmt -w $COLUMNS print -l ${(q-)custom_themes}
}
(( ${#builtin_themes} )) && { (( ${#builtin_themes} )) && {
# add a line of separation # add a line of separation
(( ${#custom_themes} )) && echo (( ${#custom_themes} )) && echo
print -Pn "%U%BBuilt-in themes%b%u: " print -Pn "%U%BBuilt-in themes%b%u: "
print -l ${(q-)builtin_themes} 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 { function _omz::theme::use {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment