From 5bef3915bc6e88d8412349d8886852fbc1af249d Mon Sep 17 00:00:00 2001
From: Abdelhak Marouane <am0089@uah.edu>
Date: Tue, 20 Aug 2024 13:52:18 -0500
Subject: [PATCH] Fix persistant cd command line

---
 Makefile | 40 +++++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/Makefile b/Makefile
index 55d2c02c..a42e487e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,6 @@ SECRET_NAME=""
 ENV_FILE=".env"
 SM2A_FOLDER="sm2a"
 
-CHDIR_SHELL := $(SHELL)
-define chdir
-   $(eval _D=$(firstword $(1) $(@D)))
-   $(info $(MAKE): cd $(_D)) $(eval SHELL = cd $(_D); $(CHDIR_SHELL))
-endef
 
 
 important_message = \
@@ -32,16 +27,15 @@ count_down = \
 	test
 
 
-all: switch-to-sm2a sm2a-local-init sm2a-local-run
+all: sm2a-local-init sm2a-local-run
 
 test:
 	pytest tests
 
-switch-to-sm2a:
-	$(call chdir,${SM2A_FOLDER})
 
-sm2a-local-run: switch-to-sm2a sm2a-local-stop sm2a-cp-dags
+sm2a-local-run: sm2a-local-stop sm2a-cp-dags
 	@echo "Running SM2A"
+	cd ${SM2A_FOLDER} && \
 	docker compose up -d
 	$(call important_message, "Give the resources a minute to be healthy 💪")
 	$(count_down)
@@ -49,28 +43,28 @@ sm2a-local-run: switch-to-sm2a sm2a-local-stop sm2a-cp-dags
 	echo "username:airflow | password:airflow"
 	echo "To use local SM2A with AWS update ${SM2A_FOLDER}/sm2a-local-config/.env AWS credentials"
 
-sm2a-local-init: switch-to-sm2a sm2a-cp-dags
-	cp sm2a-local-config/env_example sm2a-local-config/.env
-	docker compose run --rm airflow-cli db init
-	docker compose run --rm airflow-cli users create --email airflow@example.com --firstname airflow --lastname airflow --password airflow --username airflow --role Admin
+sm2a-local-init: sm2a-cp-dags
+	cp ${SM2A_FOLDER}/sm2a-local-config/env_example ${SM2A_FOLDER}/sm2a-local-config/.env
+	docker compose -f ${SM2A_FOLDER}/docker-compose.yml run --rm airflow-cli db init
+	docker compose -f ${SM2A_FOLDER}/docker-compose.yml run --rm airflow-cli users create --email airflow@example.com --firstname airflow --lastname airflow --password airflow --username airflow --role Admin
 
-sm2a-local-stop: switch-to-sm2a
-	docker compose down
+sm2a-local-stop:
+	docker compose -f ${SM2A_FOLDER}/docker-compose.yml down
 
 sm2a-cp-dags:
-	cp -r ../dags dags
+	cp -r dags ${SM2A_FOLDER}/.
 
-sm2a-deploy: switch-to-sm2a sm2a-cp-dags
+sm2a-deploy: sm2a-cp-dags
 	@echo "Installing the deployment dependency"
-	pip install -r deploy_requirements.txt
-	echo "Deploying SM2A"
-	python scripts/generate_env_file.py --secret-id ${SECRET_NAME} --env-file ${ENV_FILE}
-	./scripts/deploy.sh ${ENV_FILE} <<< init
+	cd ${SM2A_FOLDER} && \
+	pip install -r deploy_requirements.txt && \
+	echo "Deploying SM2A" && \
+	python ./scripts/generate_env_file.py --secret-id ${SECRET_NAME} --env-file ${ENV_FILE} && \
+	./scripts/deploy.sh ${ENV_FILE} <<< init && \
 	./scripts/deploy.sh ${ENV_FILE} <<< deploy
 
-clean: switch-to-sm2a sm2a-local-stop
+clean: sm2a-local-stop
 	@echo "Cleaning local env"
 	docker container prune -f
 	docker image prune -f
 	docker volume prune -f
-