- Added ability to force switch to CE or EE edition

- EE is installed by default if EE repository is specified in config.yaml

Author: Alexander Paliarush

CHANGELOG.md

@@ -14,6 +14,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
  - Removed requirement for public github token due to Composer limitations (issue is fixed on Composer side)
  - Changed requirement for minimum box version from 1.0 to 1.1
  - Upgraded PHP 5.5.9 to PHP 5.6
+ - When [init_project.sh](init_project.sh) is executed, EE will be installed by default, if EE repository is specified in [etc/config.yaml.dist](etc/config.yaml.dist)
 
 ### Fixed
 
@@ -29,6 +30,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
  - Added ability to modify guest config files (PHP, Apache etc) directly from host IDE
  - Added ability to choose if PhpStorm configs should be removed during project reinitialization
  - Added ability to switch PHP version without destroying the project ("vagrant reload" is required)
+ - Added ability to do force switch to CE or EE (even if already switched to target edition)
 
 ## [v2.0.0] - 2016-02-05
 

README.md

@@ -168,6 +168,9 @@ bash m-switch-to-ce
 OR
 bash m-switch-to-ee
 ```
+
+Force switch can be done using `-f` flag even if already switched to the target edition. May be helpful to relink EE modules after switching between branches.
+
 :information_source: On Windows hosts (or when NFS mode is disabled in [config.yaml](etc/config.yaml.dist) explicitly) you will be asked to wait until code is uploaded to guest machine by PhpStorm (PhpStorm must be lunched). To continue the process press any key.
 
 ### Update Composer dependencies

Vagrantfile

@@ -101,8 +101,6 @@ Vagrant.configure(VAGRANT_API_VERSION) do |config|
         config.vm.provision "guest_remove_compressed_code", type: "shell", inline: "rm -f /vagrant/scripts/host/magento2ce.tar"
     end
 
-    config.vm.provision "install_magento", type: "shell", inline: "m-reinstall"
-
     # Host manager plugin configuration
     config.hostmanager.enabled = true
     config.hostmanager.manage_host = true

init_project.sh

@@ -83,6 +83,12 @@ bash "${vagrant_dir}/scripts/host/composer.sh" install
 cd "${vagrant_dir}"
 vagrant up
 
+if [[ -n "${repository_url_ee}" ]]; then
+    bash "${vagrant_dir}/m-switch-to-ee" -f
+else
+    bash "${vagrant_dir}/m-switch-to-ce" -f
+fi
+
 set +x
 echo "Configuring PhpStorm..."
 if [[ ${force_project_cleaning} -eq 1 ]] && [[ ${force_phpstorm_config_cleaning} -eq 1 ]]; then

m-switch-to-ce

@@ -10,12 +10,22 @@ php_executable=$(bash "${vagrant_dir}/scripts/host/get_path_to_php.sh")
 set -ex
 
 if [[ ! -f ${magento_ee_dir}/app/etc/aliases_to_classes_map.json ]]; then
+    set +x
     echo "EE codebase is not available"
     exit 0
 fi
 
-if [[ ! -f ${magento_ce_dir}/app/etc/aliases_to_classes_map.json ]]; then
-    echo "Already switched to CE"
+force_switch=0
+while getopts 'f' flag; do
+  case "${flag}" in
+    f) force_switch=1 ;;
+    *) error "Unexpected option ${flag}" ;;
+  esac
+done
+
+if [[ ! -f ${magento_ce_dir}/app/etc/aliases_to_classes_map.json ]] && [[ ${force_switch} -eq 0 ]]; then
+    set +x
+    echo "Already switched to CE. Use 'm-switch-to-ce -f' to switch anyway."
     exit 0
 fi
 

m-switch-to-ee

@@ -10,12 +10,22 @@ php_executable=$(bash "${vagrant_dir}/scripts/host/get_path_to_php.sh")
 set -ex
 
 if [[ ! -f ${magento_ee_dir}/app/etc/aliases_to_classes_map.json ]]; then
+    set +x
     echo "EE codebase is not available"
     exit 0
 fi
 
-if [[ -f ${magento_ce_dir}/app/etc/aliases_to_classes_map.json ]]; then
-    echo "Already switched to EE"
+force_switch=0
+while getopts 'f' flag; do
+  case "${flag}" in
+    f) force_switch=1 ;;
+    *) error "Unexpected option ${flag}" ;;
+  esac
+done
+
+if [[ -f ${magento_ce_dir}/app/etc/aliases_to_classes_map.json ]] && [[ ${force_switch} -eq 0 ]]; then
+    set +x
+    echo "Already switched to EE. Use 'm-switch-to-ce -f' to switch anyway."
     exit 0
 fi
 

scripts/guest/m-reinstall

@@ -63,7 +63,7 @@ install_cmd="./bin/magento setup:install \
     --use-rewrites=1"
 
 # Configure Rabbit MQ
-if [[ -f "${MAGENTO_ROOT}/app/etc/enterprise/di.xml" ]] && [[ -d "${MAGENTO_ROOT}/app/code/Magento/Amqp" ]]; then
+if [[ -f "${MAGENTO_ROOT}/app/etc/enterprise/di.xml" ]]; then
     install_cmd="${install_cmd} \
     --amqp-host=${setupOptions[amqp_host]} \
     --amqp-port=${setupOptions[amqp_port]} \