linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-12 21:39:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some comments and messages. Remove (probably) debug messages. Improve ZSH_COLORIZE_TOOL recognition.

Browse source
This commit is contained in:
Jakob Probst 2019-11-16 13:10:02 +01:00
parent 8aa070db0e
commit d08238fb0f
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/colorize/README.md
View file

@ -14,7 +14,7 @@ plugins=(... colorize)
### Colorize tool ### Colorize tool
Colorize supports using either the `pygmentize` tool or the `chroma` tool. By default colorize uses `pygmentize` unless it's not installed & `chroma` is installed. However, you can override this with the `ZSH_COLORIZE_TOOL` environment variable: Colorize supports `pygmentize` and `chroma` as syntax highlighter. By default colorize uses `pygmentize` unless it's not installed and `chroma` is. This can be overridden by the `ZSH_COLORIZE_TOOL` environment variable:
``` ```
ZSH_COLORIZE_TOOL=chroma ZSH_COLORIZE_TOOL=chroma

17
plugins/colorize/colorize.plugin.zsh
View file

@ -3,11 +3,7 @@ alias ccat='colorize_via_pygmentize'
alias cless='colorize_via_pygmentize_less' alias cless='colorize_via_pygmentize_less'
colorize_via_pygmentize() { colorize_via_pygmentize() {
local available_tools=("chroma" "pygmentize")
if [[ $ZSH_COLORIZE_TOOL != "chroma" && $ZSH_COLORIZE_TOOL != "pygmentize" ]]; then
echo "ZSH_COLORIZE_TOOL not recognized. Options are 'pygmentize' or 'chroma'"
return 1
fi
if [ -z $ZSH_COLORIZE_TOOL ]; then if [ -z $ZSH_COLORIZE_TOOL ]; then
if (( $+commands[pygmentize] )); then if (( $+commands[pygmentize] )); then
@ -15,12 +11,18 @@ colorize_via_pygmentize() {
elif (( $+commands[chroma] )); then elif (( $+commands[chroma] )); then
ZSH_COLORIZE_TOOL="chroma" ZSH_COLORIZE_TOOL="chroma"
else else
echo "niether 'Pygments' nor 'chroma' is not installed!" echo "Neither 'pygments' nor 'chroma' is installed!"
return 1 return 1
fi fi
fi fi
echo "Tool: $ZSH_COLORIZE_TOOL" if [[ ${available_tools[(Ie)$ZSH_COLORIZE_TOOL]} -eq 0 ]]; then
echo "ZSH_COLORIZE_TOOL '$ZSH_COLORIZE_TOOL' not recognized. Available options are 'pygmentize' and 'chroma'."
return 1
elif (( $+commands[$ZSH_COLORIZE_TOOL] )); then
echo "Package '$ZSH_COLORIZE_TOOL' is not installed!"
return 1
fi
# If the environment variable ZSH_COLORIZE_STYLE # If the environment variable ZSH_COLORIZE_STYLE
# is set, use that theme instead. Otherwise, # is set, use that theme instead. Otherwise,
@ -35,7 +37,6 @@ colorize_via_pygmentize() {
fi fi
fi fi
echo "color style: $ZSH_COLORIZE_STYLE"
# pygmentize stdin if no arguments passed # pygmentize stdin if no arguments passed
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
if [[ $ZSH_COLORIZE_TOOL == "pygmentize" ]]; then if [[ $ZSH_COLORIZE_TOOL == "pygmentize" ]]; then