From 5c49535c59cf96b2ad763e94deffc40baf5101db Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Fri, 9 Oct 2015 16:39:13 +0300 Subject: [PATCH] build.mk: get rid of GREP_OPTIONS It was superfluous in the first place indeed, and new grep(1) considers the option deprecated. --- lib/build.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/build.mk b/lib/build.mk index e41984d3..c8e7b9f9 100644 --- a/lib/build.mk +++ b/lib/build.mk @@ -66,8 +66,8 @@ build-image: profile/populate tail -n $(MAX_LINES) "$(BUILDLOG)" $(SHORTEN) \ | if [ -z "$(QUIET)" ]; then \ echo "$(TIME) done $$DURATION"; \ - GREP_COLOR="$(ANSI_OK)" GREP_OPTIONS="--color=auto" \ - grep '^\*\* image: .*$$' ||:; \ + GREP_COLOR="$(ANSI_OK)" \ + grep --color=auto '^\*\* image: .*$$' ||:; \ else \ echo -n "$(TIME) $$DURATION "; \ sed -rn 's/^\*\* image: (.*)$$/\1/p'; \ @@ -85,8 +85,8 @@ build-image: profile/populate echo "$(TIME) (you might want to rerun with DEBUG=1)"; \ fi; \ tail -n $(MAX_LINES) "$(BUILDLOG)" \ - | GREP_COLOR="$(ANSI_FAIL)" GREP_OPTIONS="--color=auto" \ - egrep -m "$(MAX_ERRORS)" "$(GOTCHA)"; \ + | GREP_COLOR="$(ANSI_FAIL)" \ + egrep --color=auto -m "$(MAX_ERRORS)" "$(GOTCHA)"; \ df -P $(BUILDDIR) | awk 'END { if ($$4 < $(LOWSPACE)) \ { print "NB: low space on "$$6" ("$$5" used)"}}'; \ fi; \