gopher.sh: rename ImageUtils.sh -> img2aa

[gofetch.git] / gopher.sh

diff --git a/gopher.sh b/gopher.sh
index 6b16f264bed62a596d1feefe2f826639f0e0cab7..c026b9c9839226c14ce2a7f7f706b40c2ec10a1f 100755 (executable)
--- a/gopher.sh
+++ b/gopher.sh
@@ -47,7 +47,7 @@ if [ "$LINK_COLOR" != "-" ]; then
        EL="`tput init`";
 fi
 
-PREFIX="[0-9h]"
+PREFIX="[0-9hIg]"
 
 # $0 [FILE]
 # Display a gopher menu for the given resource
@@ -142,19 +142,21 @@ download)
        echo "<BINARY FILE>" | less
 ;;
 g|I)
-       if convert -h >/dev/null 2>&1; then
-               if jp2a -h >/dev/null 2>&1; then
+       if img2aa --help >/dev/null 2>&1; then
+               img2aa --mode=DITHERING \
+                       --width=74 "$tmp" | less
+       elif jp2a -h >/dev/null 2>&1; then
+               if convert -h >/dev/null 2>&1; then
                        convert "$tmp" "$tmp.jpg"
-                       # not supported: --chars=" ░▒▓█"
-                       jp2a --border --colors --chars=" .-+=o8#"\
+                       jp2a --border --chars=" .-+=o8#"\
                                --width=74 "$tmp.jpg" | less
                else
-                       echo "required program not found to view images: jp2a" \
+                       echo "required program not found to view images: convert" \
                                | less
                fi
        else
-               echo "required program not found to view images: convert" \
-                       | less
+               echo "required program not found to view images:" \
+                       jp2a or img2aa | less
        fi
 ;;
 *)