From b8356773485baa21548c3a39f31fb9b52b95ba71 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Thu, 29 Feb 2024 22:49:41 +0100 Subject: [PATCH] NOTICKET: fix config --- app/Makefile | 16 ++++++++-------- app/bin/make/check.sh | 7 +++++++ app/bin/make/colors.sh | 7 +++++-- app/compose.yaml | 2 +- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/app/Makefile b/app/Makefile index c302746..5d13813 100644 --- a/app/Makefile +++ b/app/Makefile @@ -25,10 +25,10 @@ endif fresh: ## Starts a Fresh Local Instance @make down -s - @symfony composer install -s - @npm i .s - @make up .s - @make db-demo s + @symfony composer install + @npm i + @make up -s + @make db-demo -s ##|——[ Code Quality ]————————————————————————————————————————————————————————————————————| @@ -55,9 +55,9 @@ lint-twig: ## Runs Twig Linting ##|——[ Data ]————————————————————————————————————————————————————————————————————————————| db-demo: ## Writes the Demo Data to the Local Instance - symofny console doctrine:database:drop --if-exists --force - symofny console doctrine:database:create - symofny console doctrine:schema:update --force + symfony console doctrine:database:drop --if-exists --force + symfony console doctrine:database:create + symfony console doctrine:schema:update --force symfony console doctrine:fixtures:load -n symfony console cache:clear @@ -65,4 +65,4 @@ db-migration-gen: ## Generates a Migration symfony console doctrine:migration:diff db-migration-do: ## Does the Migration - symfony console doctrine:migration:migrate \ No newline at end of file + symfony console doctrine:migration:migrate diff --git a/app/bin/make/check.sh b/app/bin/make/check.sh index 04e9d16..799da45 100755 --- a/app/bin/make/check.sh +++ b/app/bin/make/check.sh @@ -32,6 +32,13 @@ current_php_version=$(symfony php -r "echo PHP_MAJOR_VERSION.'.'.PHP_MINOR_VERSI } && \ printf >&2 "${GREEN_FG}✔ PHP${BLUE_FG} Version ${GREEN_FG}${current_php_version}${BLUE_FG} is ${GREEN_FG}installed${BLUE_FG}.\n" +# Check PHP PDO_MYSQL +php -m | grep -i pdo_mysql >/dev/null 2>&1 || \ +{ \ + printf >&2 "${RED_FG}✘ PHP PDO_MSQL${YELLOW_FG} is ${RED_FG}not installed${YELLOW_FG}!\n"; \ + exit 1; \ +} + # Check Composer command -v composer >/dev/null 2>&1 || \ { \ diff --git a/app/bin/make/colors.sh b/app/bin/make/colors.sh index 8d6d169..b07ec93 100755 --- a/app/bin/make/colors.sh +++ b/app/bin/make/colors.sh @@ -9,8 +9,11 @@ COLOR_CLEAR='0' COLOR_FG='3' COLOR_BG='4' -COLOR_WHITE='8' -COLOR_BLACK='7' +COLOR_WHITE='9' +COLOR_LIGHT_GRAY='8' +COLOR_GRAY='7' +COLOR_BLACK='0' + COLOR_RED='1' COLOR_GREEN='2' COLOR_YELLOW='3' diff --git a/app/compose.yaml b/app/compose.yaml index ffad284..a3418b3 100644 --- a/app/compose.yaml +++ b/app/compose.yaml @@ -9,7 +9,7 @@ services: volumes: - 'mysql_data:/var/lib/mysql' environment: - MSQL_ROOT_PASSWORD: 'empty' + MYSQL_ROOT_PASSWORD: 'empty' ###< doctrine/doctrine-bundle ### volumes: