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

ascii: Simplify function.

Browse source
This commit is contained in:
Dylan Araps 2018-05-31 08:04:01 +10:00
parent b93eb5ad30
commit c6fde1ff9a
1 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
neofetch
View file

@ -3418,17 +3418,8 @@ image_backend() {
} }
get_ascii() { get_ascii() {
if [[ ! -f "$image_source" || if [[ ! -f "$image_source" ]]; then
"$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." 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
} }