kforney/hyfetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ascii: Fixed bug causing files named ascii to not work.

Browse source
This commit is contained in:
Dylan Araps 2019-01-09 08:50:01 +02:00
parent 9431a593f6
commit 64188697b8
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
neofetch
View file

@ -3414,7 +3414,7 @@ image_backend() {
{ image_backend="ascii"; err "Image: Imagemagick not found, falling back to ascii mode."; } { image_backend="ascii"; err "Image: Imagemagick not found, falling back to ascii mode."; }
case "${image_backend:-off}" in case "${image_backend:-off}" in
"ascii") get_ascii ;; "ascii") print_ascii ;;
"off") image_backend="off" ;; "off") image_backend="off" ;;
"caca" | "chafa" | "jp2a" | "iterm2" | "termpix" |\ "caca" | "chafa" | "jp2a" | "iterm2" | "termpix" |\
@ -3445,7 +3445,7 @@ image_backend() {
err "Image: Valid backends are: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', 'kitty', err "Image: Valid backends are: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', 'kitty',
'off', 'sixel', 'pixterm', 'termpix', 'tycat', 'w3m')" 'off', 'sixel', 'pixterm', 'termpix', 'tycat', 'w3m')"
err "Image: Falling back to ascii mode." err "Image: Falling back to ascii mode."
get_ascii print_ascii
;; ;;
esac esac
@ -3453,7 +3453,7 @@ image_backend() {
[[ "$image_backend" != "off" ]] && printf '\e[%sA\e[9999999D' "${lines:-0}" [[ "$image_backend" != "off" ]] && printf '\e[%sA\e[9999999D' "${lines:-0}"
} }
get_ascii() { print_ascii() {
if [[ -f $image_source && ! $image_source =~ (png|jpg|jpeg|jpe|svg|gif) ]]; then if [[ -f $image_source && ! $image_source =~ (png|jpg|jpeg|jpe|svg|gif) ]]; then
ascii_data="$(< "$image_source")" ascii_data="$(< "$image_source")"
elif [[ $image_source == ascii || $image_source == auto ]]; then elif [[ $image_source == ascii || $image_source == auto ]]; then
@ -3472,7 +3472,7 @@ get_ascii() {
done <<< "${ascii_data//\$\{??\}}" done <<< "${ascii_data//\$\{??\}}"
# Fallback if file not found. # Fallback if file not found.
((lines==1)) && { lines=; ascii_len=; image_source="auto"; get_distro_ascii; get_ascii; return; } ((lines==1)) && { lines=; ascii_len=; image_source="auto"; get_distro_ascii; print_ascii; return; }
# Colors. # Colors.
ascii_data="${ascii_data//\$\{c1\}/$c1}" ascii_data="${ascii_data//\$\{c1\}/$c1}"
@ -3891,7 +3891,7 @@ display_image() {
to_ascii() { to_ascii() {
err "$1" err "$1"
image_backend="ascii" image_backend="ascii"
get_ascii print_ascii
# Set cursor position next image/ascii. # Set cursor position next image/ascii.
printf '\e[%sA\e[9999999D' "${lines:-0}" printf '\e[%sA\e[9999999D' "${lines:-0}"