From 3205ec0fbc89a6f594db2e2e8d914bdbf52e1395 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 19 Dec 2016 15:56:30 +1100 Subject: [PATCH] Image: Disable image mode if $DISPLAY is unset, closes #543 --- neofetch | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 3eedd09d..b62a55d0 100755 --- a/neofetch +++ b/neofetch @@ -1770,10 +1770,18 @@ get_cols() { get_image_backend() { # This function determines which image backend to use # by checking for programs and etc. - get_image_program - # Fallback to ascii mode if imagemagick isn't installed. - type -p convert >/dev/null 2>&1 || image_backend="ascii" + # If the image source isn't 'ascii' or 'off' + 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" == "ascii" ]]; then