From 62582e0b2e91775ba9040fb9ba8ff5df0df66191 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Sat, 21 Jan 2023 14:27:20 -0600 Subject: [PATCH] chore: update task.mk --- .task.cfg.mk | 4 ++++ Makefile | 29 +++++++++-------------------- 2 files changed, 13 insertions(+), 20 deletions(-) create mode 100644 .task.cfg.mk diff --git a/.task.cfg.mk b/.task.cfg.mk new file mode 100644 index 0000000..6c0040b --- /dev/null +++ b/.task.cfg.mk @@ -0,0 +1,4 @@ +GOAL_STYLE = b_magenta +HELP_SEP = {a.b_green}->>{a.end} +USAGE = {a.italic}{a.b_cyan}Best Dots Around{a.end}\n + diff --git a/Makefile b/Makefile index 4e35eba..bdaf5a9 100644 --- a/Makefile +++ b/Makefile @@ -1,37 +1,30 @@ -## lint | lint.* -.PHONY: lint -lint: lint.py lint.sh +lint: lint.py lint.sh ## lint.* msg = $(if tprint,$(call tprint,{a.b_magenta}==>{a.end}{a.bold} $(1){a.end}),@echo '==> $(1)') -## lint.py | lint python files -.PHONY: lint.py -lint.py: info +lint.py: info ## lint python files $(call msg,Linting Python Files) @black $(shell find -type f -name "*.py") -## lint.sh | lint shell files .PHONY: lint.sh -lint.sh: +lint.sh: ## lint shell files $(call msg,Linting Shell Files) @shfmt -s -w $(shell shfmt -f .) -## completions | generate completion scripts -completions: +completions: ## generate completion scripts $(call msg,Generating Completions) @./lib/completions/update.sh -## fzf | update fzf shell scripts .PHONY: fzf -fzf: lib/.fzf/completion.zsh lib/.fzf/key-bindings.zsh +fzf: lib/.fzf/completion.zsh lib/.fzf/key-bindings.zsh ## update fzf shell scripts +# update fzf shell scripts lib/.fzf/%.zsh: FORCE wget -O $@ \ https://raw.githubusercontent.com/junegunn/fzf/master/shell/$*.zsh -## db, d-build | build docker image .PHONY: db d-build -db d-build: +db d-build: ## build docker image $(call msg,Building Docker Image) @DOCKER_BUILDKIT=1 docker build \ --secret id=GITHUB_TOKEN \ @@ -39,9 +32,8 @@ db d-build: -f docker/Dockerfile \ -t dots . -## dr, d-run | run docker image .PHONY: dr d-run -dr d-run: +dr d-run: ## run docker image $(call msg,Running Docker Image) docker run --rm -it dots @@ -52,8 +44,5 @@ dr-keep: FORCE: .DEFAULT_GOAL = help -GOAL_STYLE = b_magenta -HELP_SEP = {a.b_green}->>{a.end} -USAGE = {a.italic}{a.b_cyan}Best Dots Around{a.end}\n --include .task.mk +-include .task.cfg.mk .task.mk $(if $(wildcard .task.mk),,.task.mk: ; @curl -fsSL https://raw.githubusercontent.com/daylinmorgan/task.mk/main/task.mk -o .task.mk 2>/dev/null || echo "no curl, skipping task.mk download")