diff options
| author | Joe Carstairs <me@joeac.net> | 2026-07-05 23:01:56 +0100 |
|---|---|---|
| committer | Joe Carstairs <me@joeac.net> | 2026-07-05 23:01:56 +0100 |
| commit | 56393380b9054600c80e9cb3db88ba69feff511b (patch) | |
| tree | d90eb34bcb9c713d238824aa8b03fae760f074ba | |
| parent | d51d1a12663133cb32b6144d1bd3815cf92e1d53 (diff) | |
only make .env if dir exists
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | make/vars.mk | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -39,7 +39,7 @@ endef all: $(ENV_RULES) $(MAKE_RULES) $(BUILD_RULES) $(PUSH_RULES) $(foreach module,$(ALL_MODULES),$(eval $(call make_module_rule))) -$(foreach module,$(ALL_MODULES),$(eval $(call module_env_rule))) +$(foreach module,$(ALL_MODULES),$(if $(shell test -d $(module) && echo 1),$(eval $(call module_env_rule)))) .PHONY: install install: install_nginx $(ENV_RULES) $(INSTALL_RULES) install_crontab diff --git a/make/vars.mk b/make/vars.mk index b8bbb5a..246cdbd 100644 --- a/make/vars.mk +++ b/make/vars.mk @@ -54,7 +54,7 @@ $(foreach hostname,$(HOSTNAMES),$(foreach module,$(MODULES_$(hostname)),$(eval \ SUBDOMAINS := $(foreach module,$(MODULES),$(SUBDOMAIN_$(module))) NGINX_SUBDOMAINS := $(foreach module,$(NGINX_MODULES),$(SUBDOMAIN_$(module))) -ENV_RULES := $(foreach module,$(MODULES),$(module)/.env) +ENV_RULES := $(foreach module,$(MODULES),$(if $(shell test -d $(module) && echo 1),$(module)/.env)) MAKE_RULES := $(foreach module,$(MAKE_MODULES),make_$(module)) BUILD_RULES := $(foreach module,$(filter $(COMPOSE_SERVICES),$(MODULES)),build_$(module)) PUSH_RULES := $(foreach module,$(filter $(COMPOSE_SERVICES),$(MODULES)),push_$(module)) |