Fix Makefile

Author: ivan-borovets

Makefile

@@ -3,23 +3,25 @@ PYTHON := python
 CONFIGS_DIG := config
 TOML_CONFIG_MANAGER := $(CONFIGS_DIG)/toml_config_manager.py
 
+.PHONY: guard-APP_ENV
+guard-APP_ENV:
+	@if [ -z "$$APP_ENV" ]; then \
+		echo "APP_ENV is not set. Set APP_ENV before running this command."; \
+		exit 1; \
+	fi
+
 .PHONY: env dotenv
 env:
 	@echo APP_ENV=$(APP_ENV)
 
-dotenv:
-	@$(PYTHON) $(TOML_CONFIG_MANAGER) ${APP_ENV}
+dotenv: guard-APP_ENV
+	@$(PYTHON) $(TOML_CONFIG_MANAGER) $(APP_ENV)
 
 # Docker compose
 DOCKER_COMPOSE := docker compose
 DOCKER_COMPOSE_PRUNE := scripts/makefile/docker_prune.sh
 
-.PHONY: guard-APP_ENV up.db up.db-echo up up.echo down down.total logs.db shell.db prune
-guard-APP_ENV:
-ifndef APP_ENV
-	$(error "APP_ENV is not set. Set APP_ENV before running this command.")
-endif
-
+.PHONY: up.db up.db-echo up up.echo down down.total logs.db shell.db prune
 up.db: guard-APP_ENV
 	@echo "APP_ENV=$(APP_ENV)"
 	@cd $(CONFIGS_DIG)/$(APP_ENV) && $(DOCKER_COMPOSE) --env-file .env.$(APP_ENV) up -d web_app_db_pg --build
@@ -28,11 +30,11 @@ up.db-echo: guard-APP_ENV
 	@echo "APP_ENV=$(APP_ENV)"
 	@cd $(CONFIGS_DIG)/$(APP_ENV) && $(DOCKER_COMPOSE) --env-file .env.$(APP_ENV) up web_app_db_pg --build
 
-up:
+up: guard-APP_ENV
 	@echo "APP_ENV=$(APP_ENV)"
 	@cd $(CONFIGS_DIG)/$(APP_ENV) && $(DOCKER_COMPOSE) --env-file .env.$(APP_ENV) up -d --build
 
-up.echo:
+up.echo: guard-APP_ENV
 	@echo "APP_ENV=$(APP_ENV)"
 	@cd $(CONFIGS_DIG)/$(APP_ENV) && $(DOCKER_COMPOSE) --env-file .env.$(APP_ENV) up --build
 
@@ -42,10 +44,10 @@ down: guard-APP_ENV
 down.total: guard-APP_ENV
 	@cd $(CONFIGS_DIG)/$(APP_ENV) && $(DOCKER_COMPOSE) --env-file .env.$(APP_ENV) down -v
 
-logs.db:
+logs.db: guard-APP_ENV
 	@cd $(CONFIGS_DIG)/$(APP_ENV) && $(DOCKER_COMPOSE) --env-file .env.$(APP_ENV) logs -f web_app_db_pg
 
-shell.db:
+shell.db: guard-APP_ENV
 	@cd $(CONFIGS_DIG)/$(APP_ENV) && $(DOCKER_COMPOSE) --env-file .env.$(APP_ENV) exec web_app_db_pg sh
 
 prune:
@@ -90,4 +92,4 @@ tree: pycache-del
 
 # Dishka
 plot-data:
-	python $(DISHKA_PLOT_DATA)
+	@$(PYTHON) $(DISHKA_PLOT_DATA)