.github/workflows/dependencies/requirements.txt

@@ -1,7 +1,7 @@
 certifi==2024.7.4
 charset-normalizer==3.3.2
 idna==3.7
-PyYAML==6.0.2
+PyYAML==6.0.1
 requests==2.32.3
 semver==3.0.2
 urllib3==2.2.2

plugins/catimg/README.md

@@ -1,7 +1,6 @@
 # catimg
 
-Plugin for displaying images on the terminal using the `catimg.sh` script provided by
+Plugin for displaying images on the terminal using the `catimg.sh` script provided by [posva](https://github.com/posva/catimg)
-[posva](https://github.com/posva/catimg)
 
 To use it, add `catimg` to the plugins array in your zshrc file:
 
@@ -11,7 +10,7 @@ plugins=(... catimg)
 
 ## Requirements
 
-- `magick convert` (ImageMagick)
+- `convert` (ImageMagick)
 
 ## Functions
 

plugins/catimg/catimg.plugin.zsh

@@ -9,11 +9,9 @@
 
 
 function catimg() {
-  if (( $+commands[magick] )); then
+  if [[ -x  `which convert` ]]; then
-    CONVERT_CMD="magick" zsh $ZSH/plugins/catimg/catimg.sh $@
+    zsh $ZSH/plugins/catimg/catimg.sh $@
-  elif (( $+commands[convert] )); then
-    CONVERT_CMD="convert" zsh $ZSH/plugins/catimg/catimg.sh $@
   else
-    echo "catimg need magick/convert (ImageMagick) to work)"
+    echo "catimg need convert (ImageMagick) to work)"
   fi
 }

plugins/catimg/catimg.sh

@@ -7,10 +7,6 @@
 # GitHub: https://github.com/posva/catimg                                      #
 ################################################################################
 
-# this should come from outside, either `magick` or `convert`
-# from imagemagick v7 and ahead `convert` is deprecated
-: ${CONVERT_CMD:=convert}
-
 function help() {
   echo "Usage catimg [-h] [-w width] [-c char] img"
   echo "By default char is \"  \" and w is the terminal width"
@@ -47,23 +43,23 @@ if [ ! "$WIDTH" ]; then
 else
   COLS=$(expr $WIDTH "/" $(echo -n "$CHAR" | wc -c))
 fi
-WIDTH=$($CONVERT_CMD "$IMG" -print "%w\n" /dev/null)
+WIDTH=$(convert "$IMG" -print "%w\n" /dev/null)
 if [ "$WIDTH" -gt "$COLS" ]; then
   WIDTH=$COLS
 fi
 
 REMAP=""
-if $CONVERT_CMD "$IMG" -resize $COLS\> +dither -remap $COLOR_FILE /dev/null ; then
+if convert "$IMG" -resize $COLS\> +dither -remap $COLOR_FILE /dev/null ; then
   REMAP="-remap $COLOR_FILE"
 else
   echo "The version of convert is too old, don't expect good results :(" >&2
-  # $CONVERT_CMD "$IMG" -colors 256 PNG8:tmp.png
+  #convert "$IMG" -colors 256 PNG8:tmp.png
   #IMG="tmp.png"
 fi
 
 # Display the image
 I=0
-$CONVERT_CMD "$IMG" -resize $COLS\> +dither `echo $REMAP` txt:- 2>/dev/null |
+convert "$IMG" -resize $COLS\> +dither `echo $REMAP` txt:- 2>/dev/null |
 sed -e 's/.*none.*/NO NO NO/g' -e '1d;s/^.*(\(.*\)[,)].*$/\1/g;y/,/ /' |
 while read R G B f; do
   if [ ! "$R" = "NO" ]; then

plugins/colorize/colorize.plugin.zsh

@@ -42,12 +42,12 @@ colorize_cat() {
         ZSH_COLORIZE_STYLE="emacs"
     fi
 
-    # Use stdin if stdin is not attached to a terminal.
+    # Use stdin if no arguments have been passed.
-    if [ ! -t 0 ]; then
+    if [ $# -eq 0 ]; then
         if [[ "$ZSH_COLORIZE_TOOL" == "pygmentize" ]]; then
             pygmentize -O style="$ZSH_COLORIZE_STYLE" -g
         else
-            chroma --style="$ZSH_COLORIZE_STYLE" --formatter="${ZSH_COLORIZE_CHROMA_FORMATTER:-terminal}" "$@"
+            chroma --style="$ZSH_COLORIZE_STYLE" --formatter="${ZSH_COLORIZE_CHROMA_FORMATTER:-terminal}"
         fi
         return $?
     fi