diff --git a/tool/ports/mk/common.inc b/tool/ports/mk/common.inc index 5117747c8..5a65fcbcd 100644 --- a/tool/ports/mk/common.inc +++ b/tool/ports/mk/common.inc @@ -9,15 +9,17 @@ VERBOSE ?= @ ECHO := echo -e HASHSUM := sha1sum -BRIGHT_COL ?= \033[01;33m -DARK_COL ?= \033[00;33m -DEFAULT_COL ?= \033[0m +BRIGHT_COL ?= \x1b[01;33m +DARK_COL ?= \x1b[00;33m +DEFAULT_COL ?= \x1b[0m -MSG_PREFIX := $(ECHO) "$(DARK_COL)$(notdir $(PORT:.port=)) $(DEFAULT_COL)" -MSG_DOWNLOAD := $(MSG_PREFIX)"download " -MSG_APPLY := $(MSG_PREFIX)"apply " -MSG_UPDATE := $(MSG_PREFIX)"update " -MSG_INSTALL := $(MSG_PREFIX)"install " -MSG_GENERATE := $(MSG_PREFIX)"generate " -MSG_EXTRACT := $(MSG_PREFIX)"extract " +MSG_PREFIX_TXT := $(DARK_COL)$(notdir $(PORT:.port=)) $(DEFAULT_COL) +MSG_PREFIX := $(ECHO) "$(MSG_PREFIX_TXT)" +MSG_DOWNLOAD := $(MSG_PREFIX)"download " +MSG_APPLY := $(MSG_PREFIX)"apply " +MSG_UPDATE := $(MSG_PREFIX)"update " +MSG_INSTALL := $(MSG_PREFIX)"install " +MSG_GENERATE := $(MSG_PREFIX)"generate " +MSG_EXTRACT := $(MSG_PREFIX)"extract " +MSG_GIT := $(MSG_PREFIX_TXT)git diff --git a/tool/ports/mk/install.mk b/tool/ports/mk/install.mk index 4c0f4bbde..4fc45ff39 100644 --- a/tool/ports/mk/install.mk +++ b/tool/ports/mk/install.mk @@ -160,7 +160,7 @@ _git_dir = $(call _assert,$(DIR($1)),Missing declaration of DIR($*)) ($(ECHO) "Error: Undefined URL for $*"; false); $(VERBOSE)dir=$(call _git_dir,$*);\ test -d $$dir || $(MSG_DOWNLOAD)$(URL($*)); \ - test -d $$dir || git clone $(URL($*)) $$dir; \ + test -d $$dir || git clone $(URL($*)) $$dir &> >(sed 's/^/$(MSG_GIT)/'); \ $(MSG_UPDATE)$$dir; \ cd $$dir && git fetch && git reset -q --hard HEAD && git checkout -q $(REV($*))