From f96c46ff9987aa6eda2460b6facbf3175fec590c Mon Sep 17 00:00:00 2001
From: Snoweuph <snow+git@euph.email>
Date: Mon, 22 Apr 2024 19:30:59 +0200
Subject: [PATCH] #1: Fix Check & Compose.yaml to be more Specific

---
 app/bin/make/check.sh | 31 +++++++++++++++++++++----------
 app/compose.yaml      |  6 +-----
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/app/bin/make/check.sh b/app/bin/make/check.sh
index 799da45..fbb73d9 100755
--- a/app/bin/make/check.sh
+++ b/app/bin/make/check.sh
@@ -6,13 +6,7 @@ printf "${BLUE_BG}                                     ${CLEAR}\n"
 printf "${BLUE_BG}${BLACK_FG}        Checking Requirements        ${CLEAR}\n"
 printf "${BLUE_BG}                                     ${CLEAR}\n"
 
-# Check Symfony CLI
-command -v symfony >/dev/null 2>&1 || \
-{ \
-  printf >&2 "${RED_FG}✘ Symfony CLI${YELLOW_FG} is ${RED_FG}not installed${YELLOW_FG}! please install it from:\nhttps://symfony.com/download\n"; \
-  exit 1; \
-}
-printf >&2 "${GREEN_FG}✔ Symfony CLI${BLUE_FG} is ${GREEN_FG}installed${BLUE_FG}!\n"
+
 
 # Check PHP
 command -v php >/dev/null 2>&1 || \
@@ -35,9 +29,10 @@ printf >&2 "${GREEN_FG}✔ PHP${BLUE_FG} Version ${GREEN_FG}${current_php_versio
 # 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"; \
+  printf >&2 "${RED_FG}✘ PHP PDO_MYSQL${YELLOW_FG} is ${RED_FG}not installed${YELLOW_FG}!\n"; \
   exit 1; \
 }
+printf >&2 "${GREEN_FG}✔ PHP MySQL PDO${BLUE_FG} is ${GREEN_FG}installed${BLUE_FG}.\n"
 
 # Check Composer
 command -v composer >/dev/null 2>&1 || \
@@ -47,7 +42,7 @@ command -v composer >/dev/null 2>&1 || \
 }
 
 # Check Composer Version
-current_composer_version=$(composer --version | awk '{print $3}' | cut -d '.' -f 1) && \
+current_composer_version=$(composer --version 2> /dev/null | awk '{print $3}' | cut -d '.' -f 1) && \
 [ "${current_composer_version}" = "2" ]  || \
 { \
   printf >&2 "${RED_FG}✘ Wrong Composer Version${YELLOW_FG} is installed!\n  Version ${RED_FG}2${YELLOW_FG} is ${RED_FG}required${YELLOW_FG}.\n"; \
@@ -55,6 +50,22 @@ current_composer_version=$(composer --version | awk '{print $3}' | cut -d '.' -f
 } && \
 printf >&2 "${GREEN_FG}✔ Composer${BLUE_FG} Version ${GREEN_FG}${current_composer_version}${BLUE_FG} is ${GREEN_FG}installed${BLUE_FG}.\n"
 
+# Check Symfony CLI
+command -v symfony >/dev/null 2>&1 || \
+{ \
+  printf >&2 "${RED_FG}✘ Symfony CLI${YELLOW_FG} is ${RED_FG}not installed${YELLOW_FG}! please install it from:\nhttps://symfony.com/download\n"; \
+  exit 1; \
+}
+printf >&2 "${GREEN_FG}✔ Symfony CLI${BLUE_FG} is ${GREEN_FG}installed${BLUE_FG}!\n"
+
+# Check JQ
+command -v jq >/dev/null 2>&1 || \
+{ \
+  printf >&2 "${RED_FG}✘ JQ${YELLOW_FG} is ${RED_FG}not installed${YELLOW_FG}!"; \
+  exit 1; \
+}
+printf >&2 "${GREEN_FG}✔ JQ${BLUE_FG} is ${GREEN_FG}installed${BLUE_FG}!\n"
+
 # Check Volta
 command -v volta >/dev/null 2>&1 || \
 { \
@@ -71,7 +82,7 @@ command -v node >/dev/null 2>&1 || \
 }
 
 # Check Node Version
-required_node_version=$(cat package.json | grep -oP '(?<="node": ")([0-9]*)(?=\.[0-9]*\.[0-9]")') && \
+required_node_version=$(cat package.json | jq .volta.node | cut -c 2- | cut -d '.' -f 1) && \
 current_major_node_version=$(node -v | cut -c 2- | cut -d '.' -f 1) && \
 current_node_version=$(node -v | cut -c 2-) && \
 [ "${current_major_node_version}" = "${required_node_version}" ]  || \
diff --git a/app/compose.yaml b/app/compose.yaml
index a3418b3..31416d9 100644
--- a/app/compose.yaml
+++ b/app/compose.yaml
@@ -1,18 +1,14 @@
 version: '3'
 
 services:
-###> doctrine/doctrine-bundle ###
   database:
-    image: mysql:8.0
+    image: docker.io/library/mysql:8.0
     ports:
       - '3306:3306'
     volumes:
       - 'mysql_data:/var/lib/mysql'
     environment:
       MYSQL_ROOT_PASSWORD: 'empty'
-###< doctrine/doctrine-bundle ###
 
 volumes:
-###> doctrine/doctrine-bundle ###
   mysql_data:
-###< doctrine/doctrine-bundle ###