From 65af033efabc536a7c2ef07e56c886cf51e031ed Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Mon, 5 Sep 2022 18:11:37 -0500 Subject: [PATCH] feat: general script runner to include bash as well --- Makefile | 11 +++++++++++ src/{py-runner.mk => runners.mk} | 12 ++++++++++-- src/task.mk | 2 +- 3 files changed, 22 insertions(+), 3 deletions(-) rename src/{py-runner.mk => runners.mk} (62%) diff --git a/Makefile b/Makefile index c91af64..5b103b7 100644 --- a/Makefile +++ b/Makefile @@ -58,6 +58,17 @@ version-check: $(call tprint-sh,{a.green}VERSION LOOKS GOOD!{a.end});\ fi + +define bash_script +echo "This is from bash" +cat /etc/hostname +printf "%s\n" "$(2)" +endef +.PHONY: test-bash +test-bash: + $(call tbash,bash_script,test bash multiline) + + define msg {a.b_yellow} It can even be multiline!{a.end} diff --git a/src/py-runner.mk b/src/runners.mk similarity index 62% rename from src/py-runner.mk rename to src/runners.mk index c84a4fa..cdb653a 100644 --- a/src/py-runner.mk +++ b/src/runners.mk @@ -1,4 +1,4 @@ -# ---- [python script runner] ---- # +# ---- [python/bash script runner] ---- # # modified from https://unix.stackexchange.com/a/223093 define \n @@ -21,8 +21,16 @@ define py @printf -- "----------------\n" @printf "$(call create_string,$($(1)))" | python3 endef +define tbash +@printf "Bash Script:\n" +@printf -- "----------------\n" +@printf "$(call create_string,$($(1)))\n" +@printf -- "----------------\n" +@printf "$(call create_string,$($(1)))" | bash +endef else py = @printf "$(call create_string,$($(1)))" | python3 +tbash = @printf "$(call create_string,$($(1)))" | bash endif -pysh = printf "$(call create_string,$($(1)))" | python3 +pysh = printf "$(call create_string,$($(1)))" | python3 \ No newline at end of file diff --git a/src/task.mk b/src/task.mk index 38f4c11..e3417dc 100644 --- a/src/task.mk +++ b/src/task.mk @@ -4,7 +4,7 @@ #% include 'builtins.mk' %# -#% include 'py-runner.mk' %# +#% include 'runners.mk' %# # ---- [python scripts] ---- #