From e015f5bbb1089686e5a79108a7e0b8c38c2af454 Mon Sep 17 00:00:00 2001 From: Willem Date: Sat, 6 Jul 2024 00:57:03 +0200 Subject: [PATCH] Move native echo to os commands. --- lib/make/mb_make.mk | 4 ++-- lib/make/mb_os.mk | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/make/mb_make.mk b/lib/make/mb_make.mk index 1a85173..600e92a 100644 --- a/lib/make/mb_make.mk +++ b/lib/make/mb_make.mk @@ -85,13 +85,13 @@ MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_make_xm define mb_make_echo_good -$(if $(filter -1,$(MB_OS_COLORS)),@echo $(MB_MAKE_ECHO_CRAYON) $(1),/usr/bin/echo -e "\x1B[32m$(MB_MAKE_ECHO_CRAYON)$$1\x1B[39m $(1)") +$(if $(filter -1,$(MB_OS_COLORS)),@echo $(MB_MAKE_ECHO_CRAYON) $(1),$(MB_OS_ECHO) -e "\x1B[32m$(MB_MAKE_ECHO_CRAYON)$$1\x1B[39m $(1)") endef MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_make_echo_good,"Echo's an message to stdout with 'green' crayon.","") define mb_make_echo_fail -$(if $(filter -1,$(MB_OS_COLORS)),@echo $(MB_MAKE_ECHO_CRAYON) $(1),/usr/bin/echo -e "\x1B[31m$(MB_MAKE_ECHO_CRAYON)$$1\x1B[39m $(1)") +$(if $(filter -1,$(MB_OS_COLORS)),@echo $(MB_MAKE_ECHO_CRAYON) $(1),$(MB_OS_ECHO) -e "\x1B[31m$(MB_MAKE_ECHO_CRAYON)$$1\x1B[39m $(1)") endef MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_make_echo_fail,"Echo's an message to stdout with 'red' crayon.","") diff --git a/lib/make/mb_os.mk b/lib/make/mb_os.mk index 4685e7b..50b9978 100644 --- a/lib/make/mb_os.mk +++ b/lib/make/mb_os.mk @@ -5,6 +5,7 @@ ifeq ($(OS),Windows_NT) MB_OS_RMDIR = RMDIR /S /Q MB_OS_MKDIR = mkdir MB_OS_COPY = copy + MB_OS_ECHO ?= echo MB_OS_ERRIGNORE = 2>NUL || true MB_OS_SEP = "\" MB_OS_CACHE ?= %LOCALAPPDATA% @@ -14,6 +15,7 @@ else MB_OS_RMDIR = rm -rf MB_OS_MKDIR = mkdir -p MB_OS_COPY = cp + MB_OS_ECHO ?= /usr/bin/echo MB_OS_ERRIGNORE = 2>/dev/null MB_OS_SEP = "/" MB_OS_CACHE ?= ~/.cache