From ad76d4d44db3a97a4b0083d18e116d4af98b8f29 Mon Sep 17 00:00:00 2001 From: Manos Pitsidianakis Date: Wed, 5 Feb 2020 03:40:35 +0200 Subject: [PATCH] Check for $TERM in Makefile If $TERM is not set, for example in a build environment, tput prints out warnings. Disable ANSI formatting completely when $TERM is unset or zero --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b3b721b3e..3446bff75 100644 --- a/Makefile +++ b/Makefile @@ -34,12 +34,12 @@ MANPATHS := `manpath 2> /dev/null` VERSION ?= `sed -n "s/^version\s*=\s*\"\(.*\)\"/\1/p" Cargo.toml` # Output parameters -BOLD ?= `tput bold` -UNDERLINE ?= `tput smul` -ANSI_RESET ?= `tput sgr0` +BOLD ?= `[ -z $${TERM} ] && echo "" || tput bold` +UNDERLINE ?= `[ -z $${TERM} ] && echo "" || tput smul` +ANSI_RESET ?= `[ -z $${TERM} ] && echo "" || tput sgr0` CARGO_COLOR ?= `[ -z $${NO_COLOR+x} ] && echo "" || echo "--color=never "` -RED ?= `[ -z $${NO_COLOR+x} ] && tput setaf 1 || echo ""` -GREEN ?= `[ -z $${NO_COLOR+x} ] && tput setaf 2 || echo ""` +RED ?= `[ -z $${NO_COLOR+x} ] && ([ -z $${TERM} ] && echo "" || tput setaf 1) || echo ""` +GREEN ?= `[ -z $${NO_COLOR+x} ] && ([ -z $${TERM} ] && echo "" || tput setaf 2) || echo ""` .POSIX: .SUFFIXES: