extern/ohmyzsh
1
0
Fork 1
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-01 20:23:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from ProbstDJakob/colorize-chroma-support

Browse Source 
Echo to Error-Stream and double quotes
This commit is contained in:
Aaron N. Brock 2019-11-17 16:02:51 -05:00 committed by GitHub
commit 5722677884
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/colorize/colorize.plugin.zsh
View File

@ -5,36 +5,36 @@ alias cless='colorize_via_pygmentize_less'
colorize_via_pygmentize() { colorize_via_pygmentize() {
local available_tools=("chroma" "pygmentize") local available_tools=("chroma" "pygmentize")
if [ -z $ZSH_COLORIZE_TOOL ]; then if [ -z "$ZSH_COLORIZE_TOOL" ]; then
if (( $+commands[pygmentize] )); then if (( $+commands[pygmentize] )); then
ZSH_COLORIZE_TOOL="pygmentize" ZSH_COLORIZE_TOOL="pygmentize"
elif (( $+commands[chroma] )); then elif (( $+commands[chroma] )); then
ZSH_COLORIZE_TOOL="chroma" ZSH_COLORIZE_TOOL="chroma"
else else
echo "Neither 'pygments' nor 'chroma' is installed!" echo "Neither 'pygments' nor 'chroma' is installed!" >&2
return 1 return 1
fi fi
fi fi
if [[ ${available_tools[(Ie)$ZSH_COLORIZE_TOOL]} -eq 0 ]]; then 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'." echo "ZSH_COLORIZE_TOOL '$ZSH_COLORIZE_TOOL' not recognized. Available options are 'pygmentize' and 'chroma'." >&2
return 1 return 1
elif (( $+commands["$ZSH_COLORIZE_TOOL"] )); then elif (( $+commands["$ZSH_COLORIZE_TOOL"] )); then
echo "Package '$ZSH_COLORIZE_TOOL' is not installed!" echo "Package '$ZSH_COLORIZE_TOOL' is not installed!" >&2
return 1 return 1
fi 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,
# use the default. # use the default.
if [ -z $ZSH_COLORIZE_STYLE ]; then if [ -z "$ZSH_COLORIZE_STYLE" ]; then
# Both pygmentize & chroma support 'emacs' # Both pygmentize & chroma support 'emacs'
ZSH_COLORIZE_STYLE="emacs" ZSH_COLORIZE_STYLE="emacs"
fi fi
# 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
pygmentize -O style="$ZSH_COLORIZE_STYLE" -g pygmentize -O style="$ZSH_COLORIZE_STYLE" -g
else else
chroma --style="$ZSH_COLORIZE_STYLE" chroma --style="$ZSH_COLORIZE_STYLE"
@ -48,7 +48,7 @@ colorize_via_pygmentize() {
local FNAME lexer local FNAME lexer
for FNAME in "$@" for FNAME in "$@"
do do
if [[ $ZSH_COLORIZE_TOOL == "pygmentize" ]]; then if [[ "$ZSH_COLORIZE_TOOL" == "pygmentize" ]]; then
lexer=$(pygmentize -N "$FNAME") lexer=$(pygmentize -N "$FNAME")
if [[ $lexer != text ]]; then if [[ $lexer != text ]]; then
pygmentize -O style="$ZSH_COLORIZE_STYLE" -l "$lexer" "$FNAME" pygmentize -O style="$ZSH_COLORIZE_STYLE" -l "$lexer" "$FNAME"