From e32279d4947b5f0affd828fdce1527fae5ed1f40 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Fri, 20 Jan 2023 12:37:00 -0600 Subject: [PATCH] refactor: use more informative syntac for tprint (-sh vs -verbose) --- Makefile | 4 ++-- src/builtins.mk | 2 +- src/runners.mk | 2 +- task.mk | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index a66b3ff..d2ec1f6 100644 --- a/Makefile +++ b/Makefile @@ -45,10 +45,10 @@ c clean: ## remove the generated files define version_check_sh if [[ "${VERSION}" == *'-'* ]]; then - $(call tprint-sh,{a.red}VERSION INVALID!{a.end} Uncommited or untagged work) + $(call tprint-verbose,{a.red}VERSION INVALID!{a.end} Uncommited or untagged work) exit 1 elif [[ $(shell echo "${VERSION}" | awk -F. '{ print NF }') -lt 3 ]];then\ - $(call tprint-sh,{a.red}VERSION INVALID!{a.end} Expected CalVer string) + $(call tprint-verbose,{a.red}VERSION INVALID!{a.end} Expected CalVer string) exit 1 fi endef diff --git a/src/builtins.mk b/src/builtins.mk index 562afce..d61b792 100644 --- a/src/builtins.mk +++ b/src/builtins.mk @@ -19,7 +19,7 @@ _print-ansi: ## show all possible ansi color code combinations $(call py,print_ansi_py) # functions to take f-string literals and pass to python print tprint = $(call py,print_py,$(1)) -tprint-sh = $(call pysh,print_py,$(1)) +tprint-verbose= $(call py-verbose,print_py,$(1)) tconfirm = $(call py,confirm_py,$(1)) _update-task.mk: ## downloads version of task.mk (TASKMK_VERSION=) $(call tprint,{a.b_cyan}Updating task.mk{a.end}) diff --git a/src/runners.mk b/src/runners.mk index 5cb406b..a7d2f7a 100644 --- a/src/runners.mk +++ b/src/runners.mk @@ -21,4 +21,4 @@ else py = @python3 <(printf "$(call _create_string,$($(1)))") tbash = @bash <(printf "$(call _create_string,$($(1)))") endif -pysh = python3 <(printf "$(call _create_string,$($(1)))") +py-verbose = python3 <(printf "$(call _create_string,$($(1)))") diff --git a/task.mk b/task.mk index 8fc3916..815570a 100644 --- a/task.mk +++ b/task.mk @@ -1,7 +1,7 @@ # }> [github.com/daylinmorgan/task.mk] <{ # # Copyright (c) 2022 Daylin Morgan # MIT License -TASKMK_VERSION ?= v22.9.28-18-g3873df0-dev +TASKMK_VERSION ?= v22.9.28-19-g13ea081-dev # task.mk should be included at the bottom of your Makefile with `-include .task.mk` # See below for the standard configuration options that should be set prior to including this file. # You can update your .task.mk with `make _update-task.mk` @@ -73,7 +73,7 @@ else py = @python3 <(printf "$(call _create_string,$($(1)))") tbash = @bash <(printf "$(call _create_string,$($(1)))") endif -pysh = python3 <(printf "$(call _create_string,$($(1)))") +py-verbose = python3 <(printf "$(call _create_string,$($(1)))") # ---- [python scripts] ---- # define help_py import argparse