From 86e4614b563751319dcfed745f23260ab132fb54 Mon Sep 17 00:00:00 2001 From: max funk Date: Sat, 13 May 2023 19:42:48 -0700 Subject: [PATCH] grep go run --- makefile | 4 ++-- scripts/start-local.sh | 2 +- test/makefile | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/makefile b/makefile index 5daf9baf..c15cbf10 100644 --- a/makefile +++ b/makefile @@ -125,8 +125,8 @@ restart-dev: $(MAKE) dev list-pids: - @ps aux | grep -e "cargo-watch" | grep -v 'grep' | awk '{len=split($$14, a, "/"); print $$2" "a[len-1]}' - @ps aux | grep -e ".bin/vite dev" | grep -v 'grep' | awk '{print $$2" client"}' + @ps aux | grep -e 'cargo-watch' -e 'go run \./' | grep -v 'grep' | awk '{len=split($$14, a, "/"); print $$2" "a[len-1]}' + @ps aux | grep -e ''.bin/vite dev' | grep -v 'grep' | awk '{print $$2" client"}' ###################### docker ###################### diff --git a/scripts/start-local.sh b/scripts/start-local.sh index 8cea9ffa..1374d7de 100644 --- a/scripts/start-local.sh +++ b/scripts/start-local.sh @@ -52,7 +52,7 @@ for d in "${APP_DIRS[@]}"; do (cd "$d"; eval $(cat $ENV_FILE_NAME) go run ./$BUILD_SRC_PATH > /dev/null 2>&1 & disown $!) fi ps aux | grep -e "go run" | grep -v 'grep' - ps aux | grep -e "go-build" | grep -v 'grep' + # ps aux | grep -e "go-build" | grep -v 'grep' make --no-print-directory list-pids else make --no-print-directory -C "$d" dev diff --git a/test/makefile b/test/makefile index 7d088ab1..a2463b33 100644 --- a/test/makefile +++ b/test/makefile @@ -53,3 +53,4 @@ get-secrets: bash scripts/create-env-file.sh \ --app-name $(APP_NAME) \ --env $(ENV) +