Ascii: Fix bug where source is an image

This commit is contained in:
Dylan Araps 2017-01-25 11:56:33 +11:00
parent 83c5751395
commit bc0118a759

View file

@ -2011,11 +2011,18 @@ image_backend() {
}
get_ascii() {
if [[ ! -f "$image_source" || "$image_source" =~ (auto|ascii) ]]; then
if [[ ! -f "$image_source" ||
"$image_source" =~ (auto|ascii) ||
"$image_source" =~ \.(png|jpg|jpe|jpeg|gif) ]]; then
# Fallback to distro ascii mode if custom ascii isn't found.
[[ ! "$image_source" =~ (auto|ascii) ]] && \
err "Ascii: Ascii file not found, using distro ascii."
# Fallback to distro ascii mode if source is an image.
[[ "$image_source" =~ \.(png|jpg|jpe|jpeg|gif) ]] && \
err "Image: Source is image file but ascii backend was selected. Using distro ascii."
if [[ -d "/usr/share/neofetch/ascii/distro" ]]; then
ascii_dir="/usr/share/neofetch/ascii/distro"