holm/ohmyzsh
1
1
Fork 0
forked from extern/ohmyzsh
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib: use column to format plugin and theme list CLI commands

Browse Source
This commit is contained in:
Marc Cornellà 2020-10-18 21:14:05 +02:00
parent 176376cbc0
commit 902954d1cc
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/cli.zsh
View File

@ -135,20 +135,17 @@ 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))
{ if (( ${#custom_plugins} )); then
(( ${#custom_plugins} )) && { print -P "%U%BCustom plugins%b%u:"
print -Pn "%U%BCustom plugins%b%u: " print -l ${(q-)custom_plugins} | column
print -l ${(q-)custom_plugins} fi
}
(( ${#builtin_plugins} )) && { if (( ${#builtin_plugins} )); then
# add a line of separation (( ${#custom_plugins} )) && echo # add a line of separation
(( ${#custom_plugins} )) && echo
print -Pn "%U%BBuilt-in plugins%b%u: " print -P "%U%BBuilt-in plugins%b%u:"
print -l ${(q-)builtin_plugins} print -l ${(q-)builtin_plugins} | column
} fi
} | fmt -w $COLUMNS | sed -E $'s/\e?(\\[[0-9]*m)/\e\\1/g' # deal with fmt removing ESC
} }
function _omz::pr { function _omz::pr {
@ -308,20 +305,17 @@ 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))
{ if (( ${#custom_themes} )); then
(( ${#custom_themes} )) && { print -P "%U%BCustom themes%b%u:"
print -Pn "%U%BCustom themes%b%u: " print -l ${(q-)custom_themes} | column
print -l ${(q-)custom_themes} fi
}
(( ${#builtin_themes} )) && { if (( ${#builtin_themes} )); then
# add a line of separation (( ${#custom_themes} )) && echo # add a line of separation
(( ${#custom_themes} )) && echo
print -Pn "%U%BBuilt-in themes%b%u: " print -P "%U%BBuilt-in themes%b%u:"
print -l ${(q-)builtin_themes} print -l ${(q-)builtin_themes} | column
} fi
} | 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 {