Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Ohmyzsh
Commits
982d010b
Commit
982d010b
authored
Oct 10, 2020
by
Marc Cornellà
Browse files
lib: fix fmt removing ESC characters in theme and plugin list CLI commands
parent
4cd5f7f9
Changes
1
Show whitespace changes
Inline
Side-by-side
lib/cli.zsh
View file @
982d010b
...
@@ -134,10 +134,11 @@ function _omz::plugin::list {
...
@@ -134,10 +134,11 @@ 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
}
))
&&
{
((
${#
custom_plugins
}
))
&&
{
print
-Pn
"%U%BCustom plugins%b%u: "
print
-Pn
"%U%BCustom plugins%b%u: "
print
-l
${
(q-)custom_plugins
}
print
-l
${
(q-)custom_plugins
}
}
|
fmt
-w
$COLUMNS
}
((
${#
builtin_plugins
}
))
&&
{
((
${#
builtin_plugins
}
))
&&
{
# add a line of separation
# add a line of separation
...
@@ -145,7 +146,8 @@ function _omz::plugin::list {
...
@@ -145,7 +146,8 @@ function _omz::plugin::list {
print
-Pn
"%U%BBuilt-in plugins%b%u: "
print
-Pn
"%U%BBuilt-in plugins%b%u: "
print
-l
${
(q-)builtin_plugins
}
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
{
function
_omz::pr
{
...
@@ -305,10 +307,11 @@ function _omz::theme::list {
...
@@ -305,10 +307,11 @@ 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
}
))
&&
{
((
${#
custom_themes
}
))
&&
{
print
-Pn
"%U%BCustom themes%b%u: "
print
-Pn
"%U%BCustom themes%b%u: "
print
-l
${
(q-)custom_themes
}
print
-l
${
(q-)custom_themes
}
}
|
fmt
-w
$COLUMNS
}
((
${#
builtin_themes
}
))
&&
{
((
${#
builtin_themes
}
))
&&
{
# add a line of separation
# add a line of separation
...
@@ -316,7 +319,8 @@ function _omz::theme::list {
...
@@ -316,7 +319,8 @@ function _omz::theme::list {
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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment