EvolutionOS
/
neofetch
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Image: Disable image mode if $DISPLAY is unset, closes #543

This commit is contained in:
Dylan Araps 2016-12-19 15:56:30 +11:00
parent 17f3a7acde
commit 3205ec0fbc
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
neofetch
View File

@ -1770,10 +1770,18 @@ get_cols() {
get_image_backend() { get_image_backend() {
# This function determines which image backend to use # This function determines which image backend to use
# by checking for programs and etc. # by checking for programs and etc.
get_image_program
# Fallback to ascii mode if imagemagick isn't installed. # If the image source isn't 'ascii' or 'off'
type -p convert >/dev/null 2>&1 || image_backend="ascii" if [[ ! "${image_source}" =~ ^(off|ascii)$ ]]; then
# If X isn't running force ascii mode here.
[[ -z "$DISPLAY" ]] && image_source="ascii"
# Fallback to ascii mode if imagemagick isn't installed.
type -p convert >/dev/null 2>&1 || image_source="ascii"
fi
# Get the image program.
get_image_program
# If image source is ascii fallback to ascii # If image source is ascii fallback to ascii
if [[ "$image_source" == "ascii" ]]; then if [[ "$image_source" == "ascii" ]]; then