Merge pull request #406 from continuouspipe/feature/detect-m2-version-differently

Extract Magento2 version detection to a function.

Author: andytson-inviqa

magento2/usr/local/share/env/30-framework

@@ -168,8 +168,3 @@ MAGENTO_ENABLE_CONFIG_WEBSERVICE_CACHE=$(convert_to_boolean_string "${MAGENTO_EN
 export MAGENTO_ENABLE_CONFIG_WEBSERVICE_CACHE
 MAGENTO_ENABLE_TARGET_RULE_CACHE=$(convert_to_boolean_string "${MAGENTO_ENABLE_TARGET_RULE_CACHE:-true}")
 export MAGENTO_ENABLE_TARGET_RULE_CACHE
-
-MAGENTO_ENTERPRISE_EDITION=$(convert_to_boolean_string "${MAGENTO_ENTERPRISE_EDITION:-$(run_return_boolean has_composer_package "magento/product-enterprise-edition")}")
-export MAGENTO_ENTERPRISE_EDITION
-
-export MAGENTO_VERSION="${MAGENTO_VERSION:-$(composer_package_version magento/product-community-edition | cut -d. -f1,2)}"

magento2/usr/local/share/env/60-framework

@@ -8,3 +8,8 @@ export BUILD_MAGENTO_MODE=${BUILD_MAGENTO_MODE:-production}
 
 # Support older configurations by setting original env vars
 export REDIS_HOST_PORT=${REDIS_PORT}
+
+MAGENTO_ENTERPRISE_EDITION=$(convert_to_boolean_string "${MAGENTO_ENTERPRISE_EDITION:-$(run_return_boolean has_composer_package "magento/product-enterprise-edition")}")
+export MAGENTO_ENTERPRISE_EDITION
+
+export MAGENTO_VERSION="${MAGENTO_VERSION:-$(detect_magento_version)}"

magento2/usr/local/share/magento2/magento_functions.sh

@@ -1,5 +1,13 @@
 #!/bin/bash
 
+function detect_magento_version() {
+  if has_composer_package magento/product-community-edition; then
+    composer_package_version magento/product-community-edition | cut -d. -f1,2
+  else
+    echo "2.1"
+  fi
+}
+
 function do_composer_config() {
   as_code_owner "composer global config repositories.magento composer https://repo.magento.com/"
 
@@ -408,12 +416,11 @@ function do_magento_download_magerun2() {
   chmod +x /app/bin/n98-magerun2.phar
 }
 
-function remove_config_template() (
-  set +e
+function remove_config_template() {
   if dpkg --compare-versions "$MAGENTO_VERSION" ge 2.2; then
     rm -f /etc/confd/conf.d/magento_config.php.toml /etc/confd/templates/magento/config.php.tmpl
   fi
-)
+}
 
 function do_magento2_templating() {
   remove_config_template