ascii: Simplify function.
This commit is contained in:
parent
b93eb5ad30
commit
c6fde1ff9a
18
neofetch
18
neofetch
|
@ -3418,17 +3418,8 @@ image_backend() {
|
||||||
}
|
}
|
||||||
|
|
||||||
get_ascii() {
|
get_ascii() {
|
||||||
if [[ ! -f "$image_source" ||
|
if [[ ! -f "$image_source" ]]; then
|
||||||
"$image_source" =~ ^(auto|ascii)$ ||
|
err "Ascii: Ascii file not found, using distro 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."
|
|
||||||
else
|
else
|
||||||
ascii_data="$(< "$image_source")"
|
ascii_data="$(< "$image_source")"
|
||||||
fi
|
fi
|
||||||
|
@ -3458,10 +3449,7 @@ get_ascii() {
|
||||||
print="${print//'${c5}'/$c5}"
|
print="${print//'${c5}'/$c5}"
|
||||||
print="${print//'${c6}'/$c6}"
|
print="${print//'${c6}'/$c6}"
|
||||||
|
|
||||||
# Overwrite padding if ascii_length_force is set.
|
((text_padding=ascii_length+gap))
|
||||||
[[ "$ascii_length_force" ]] && ascii_length="$ascii_length_force"
|
|
||||||
|
|
||||||
text_padding="$((ascii_length + gap))"
|
|
||||||
printf "%b" "$print"
|
printf "%b" "$print"
|
||||||
LC_ALL=C
|
LC_ALL=C
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue