From 78d3929f526d06b1879c565ed08b337ba6138cae Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 22 Jul 2015 08:15:18 +0100 Subject: build: if tput fails, fall back to a reasonable text width If TERM is not set (which can happen in autobuilders and other batch environments), or if tput cannot determine the number of columns for some other reason, then it can fail and not produce any output. Prior to this change, that would result in passing field width -4 to fmt, which is an error and causes fmt to produce no output. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 83431fdc..408909f3 100644 --- a/Makefile +++ b/Makefile @@ -1179,7 +1179,7 @@ ifeq ($(BUILD_MASTER_SERVER),1) endif ifneq ($(call bin_path, tput),) - TERM_COLUMNS=$(shell echo $$((`tput cols`-4))) + TERM_COLUMNS=$(shell if c=`tput cols`; then echo $$(($$c-4)); else echo 76; fi) else TERM_COLUMNS=76 endif -- cgit