diff mbox series

[OpenWrt-Devel] Honour NO_COLOR in include/scan.mk

Message ID mailman.16089.1548095525.2376.openwrt-devel@lists.openwrt.org
State Accepted, archived
Headers show
Series [OpenWrt-Devel] Honour NO_COLOR in include/scan.mk | expand

Commit Message

gio--- via openwrt-devel Jan. 21, 2019, 6:32 p.m. UTC
The sender domain has a DMARC Reject/Quarantine policy which disallows
sending mailing list messages using the original "From" header.

To mitigate this problem, the original message has been wrapped
automatically by the mailing list software.
Hi all:

This is my first OpenWrt patch. I am a clean, pure newbie! 8-)

Honour NO_COLOR in Makefile function 'progress' in include/scan.mk, in the same way that include/verbose.mk does.

Signed-off-by: R. Diez <rdiezmail-openwrt@yahoo.com>
---
  include/scan.mk | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)

Comments

Jo-Philipp Wich Jan. 30, 2019, 7:51 a.m. UTC | #1
Hi,

your patch would disable the complete output if NO_COLOR is set. That
does not seem to meet the expected behavior.

Looks like the fallback path should still print $(1) to stderr, just
without ANSI escape sequences.

~ Jo
diff mbox series

Patch

diff --git a/include/scan.mk b/include/scan.mk
index e6b21b2..724dbfa 100644
--- a/include/scan.mk
+++ b/include/scan.mk
@@ -19,9 +19,15 @@  else
  endif

  ifeq ($(IS_TTY),1)
-  define progress
+  ifneq ($(strip $(NO_COLOR)),1)
+    define progress
  	printf "\033[M\r$(1)" >&2;
-  endef
+    endef
+  else
+    define progress
+	:;
+    endef
+  endif
  else
    define progress
  	:;