Просмотр исходного кода

Merge pull request #931 from rangerz/version

Mark Shust 1 год назад
Родитель
Сommit
f0fea0d077
2 измененных файлов с 22 добавлено и 3 удалено
  1. 21 0
      compose/bin/magento-version
  2. 1 3
      compose/bin/setup-integration-tests

+ 21 - 0
compose/bin/magento-version

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+# Method 1: Using bin/magento --version
+version=$(bin/magento --version --no-ansi 2> /dev/null | cut -d" " -f 3)
+
+if [[ -z "$version" ]]; then
+    # Method 2: Using grep in composer.lock
+    version=$(grep -A 1 "magento/magento2-base" ./src/composer.lock | grep "version" | awk -F "\"" '{print $4}')
+fi
+
+if [[ -z "$version" ]]; then
+    # Method 3: Using bin/yq in composer.json
+    version=$(bin/yq -oj '.version' ./src/composer.json | sed 's/"//g')
+fi
+
+# If version is still not obtained, output error message
+if [[ -z "$version" ]]; then
+    echo "Failed to retrieve Magento version."
+else
+    echo "$version"
+fi

+ 1 - 3
compose/bin/setup-integration-tests

@@ -13,9 +13,7 @@ bin/clinotty mysql -h"${MYSQL_INTEGRATION_HOST}" -uroot -p"${MYSQL_ROOT_PASSWORD
     -e "GRANT ALL PRIVILEGES ON ${MYSQL_INTEGRATION_DATABASE}.* TO '${MYSQL_INTEGRATION_USER}'@'%';FLUSH PRIVILEGES;"
 
 if [[ ! -f "src/${MYSQL_INTEGRATION_CONFIG}" ]]; then
-  MAGENTO_VERSION=$(bin/magento --version --no-ansi | cut -d" " -f 3)
-  IFS=. read -r -a MAGENTO_VERSION_SEGMENTS <<< "${MAGENTO_VERSION}"
-  MAGENTO_MAJOR="${MAGENTO_VERSION_SEGMENTS[0]}.${MAGENTO_VERSION_SEGMENTS[1]}"
+  MAGENTO_MAJOR=$(bin/magento-version | cut -d'.' -f1,2)
   cp template/"${MYSQL_INTEGRATION_CONFIG}"."${MAGENTO_MAJOR}".dist src/${MYSQL_INTEGRATION_CONFIG}
 fi