Merge remote-tracking branch 'remotes/origin/2.0' into Email-Logging

# Conflicts:
#	init_project.sh

Author: Alexander Paliarush

init_project.sh

@@ -24,8 +24,8 @@ if ! echo ${vagrant_plugin_list} | grep -q 'vagrant-host-shell' ; then
 fi
 
 # Generate random IP address and host name to prevent collisions, if not specified explicitly in local config
-if [ ! -f "${vagrant_dir}/etc/config.yaml" ]; then
-    cp "${config_path}.dist" ${config_path}
+if [[ ! -f "${vagrant_dir}/etc/config.yaml" ]]; then
+    cp "${config_path}.dist" "${config_path}"
 fi
 random_ip=$(( ( RANDOM % 240 )  + 12 ))
 forwarded_ssh_port=$(( random_ip + 3000 ))
@@ -46,49 +46,49 @@ while getopts 'fcp' flag; do
     *) error "Unexpected option ${flag}" ;;
   esac
 done
-if [ ${force_project_cleaning} -eq 1 ]; then
+if [[ ${force_project_cleaning} -eq 1 ]]; then
     vagrant destroy -f
-    mv ${vagrant_dir}/etc/guest/.gitignore ${vagrant_dir}/etc/.gitignore.back
-    rm -rf ${vagrant_dir}/.vagrant ${vagrant_dir}/etc/guest
-    mkdir ${vagrant_dir}/etc/guest
-    mv ${vagrant_dir}/etc/.gitignore.back  ${vagrant_dir}/etc/guest/.gitignore
-    cd ${vagrant_dir}/log && mv email/.gitignore email_gitignore.back && rm -rf email && mkdir email && mv email_gitignore.back email/.gitignore
-    if [ ${force_codebase_cleaning} -eq 1 ]; then
-        rm -rf ${magento_ce_dir}
+    mv "${vagrant_dir}/etc/guest/.gitignore" "${vagrant_dir}/etc/.gitignore.back"
+    rm -rf "${vagrant_dir}/.vagrant" "${vagrant_dir}/etc/guest"
+    mkdir "${vagrant_dir}/etc/guest"
+    mv "${vagrant_dir}/etc/.gitignore.back" "${vagrant_dir}/etc/guest/.gitignore"
+    cd "${vagrant_dir}/log" && mv email/.gitignore email_gitignore.back && rm -rf email && mkdir email && mv email_gitignore.back email/.gitignore
+    if [[ ${force_codebase_cleaning} -eq 1 ]]; then
+        rm -rf "${magento_ce_dir}"
     fi
 fi
 
-if [ ! -d ${magento_ce_dir} ]; then
+if [[ ! -d ${magento_ce_dir} ]]; then
     if [[ ${host_os} == "Windows" ]]; then
         git config --global core.autocrlf false
         git config --global core.eol LF
         git config --global diff.renamelimit 5000
     fi
     # Check out CE repository
     repository_url_ce=$(bash "${vagrant_dir}/scripts/get_config_value.sh" "repository_url_ce")
-    git clone ${repository_url_ce} ${magento_ce_dir}
+    git clone ${repository_url_ce} "${magento_ce_dir}"
     # Check out EE repository
     # By default EE repository is not specified and EE project is not checked out
     repository_url_ee=$(bash "${vagrant_dir}/scripts/get_config_value.sh" "repository_url_ee")
-    if [ -n "${repository_url_ee}" ]; then
-        git clone ${repository_url_ee} ${magento_ee_dir}
+    if [[ -n "${repository_url_ee}" ]]; then
+        git clone ${repository_url_ee} "${magento_ee_dir}"
     fi
 fi
 
 # Update Magento dependencies via Composer
-cd ${magento_ce_dir}
+cd "${magento_ce_dir}"
 bash "${vagrant_dir}/scripts/host/composer.sh" install
 
 # Create vagrant project
-cd ${vagrant_dir}
+cd "${vagrant_dir}"
 vagrant up
 
 set +x
 echo "Configuring PhpStorm..."
-if [ ${force_project_cleaning} -eq 1 ] && [ ${force_phpstorm_config_cleaning} -eq 1 ]; then
-    rm -rf ${vagrant_dir}/.idea
+if [[ ${force_project_cleaning} -eq 1 ]] && [[ ${force_phpstorm_config_cleaning} -eq 1 ]]; then
+    rm -rf "${vagrant_dir}/.idea"
 fi
-if [ ! "$(ls -A ${vagrant_dir}/.idea)" ]; then
+if [[ ! "$(ls -A "${vagrant_dir}/.idea")" ]]; then
     bash "${vagrant_dir}/scripts/host/configure_php_storm.sh"
 fi
 

scripts/get_config_value.sh

@@ -5,7 +5,7 @@ parse_yaml() {
     local prefix=$2
     local s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @|tr @ '\034')
     sed -ne "s|^\($s\)\($w\)$s:$s\"\(.*\)\"$s\$|\1$fs\2$fs\3|p" \
-        -e "s|^\($s\)\($w\)$s:$s\(.*\)$s\$|\1$fs\2$fs\3|p"  $1 |
+        -e "s|^\($s\)\($w\)$s:$s\(.*\)$s\$|\1$fs\2$fs\3|p"  "$1" |
     awk -F$fs '{
         indent = length($1)/2;
         vname[indent] = $2;

scripts/host/composer.sh

@@ -16,30 +16,30 @@ bash "${vagrant_dir}/scripts/host/check_requirements.sh"
 php_executable=$(bash "${vagrant_dir}/scripts/host/get_path_to_php.sh")
 
 # Setup composer if necessary
-if [ ! -f ${composer_phar} ]; then
-    cd ${composer_dir}
+if [[ ! -f ${composer_phar} ]]; then
+    cd "${composer_dir}"
     curl -sS https://getcomposer.org/installer | ${php_executable}
 fi
 
 # Configure composer credentials
 auth_json_already_exists=0
-if [ -f "${current_dir}/auth.json" ]; then
+if [[ -f "${current_dir}/auth.json" ]]; then
     auth_json_already_exists=1
 fi
 
-cd ${current_dir}
-if [ ! ${auth_json_already_exists} = 1 ] && [ -f ${composer_auth_json} ]; then
-    cp ${composer_auth_json} "${current_dir}/auth.json"
+cd "${current_dir}"
+if [[ ! ${auth_json_already_exists} = 1 ]] && [[ -f ${composer_auth_json} ]]; then
+    cp "${composer_auth_json}" "${current_dir}/auth.json"
 fi
 
 host_os=$(bash "${vagrant_dir}/scripts/host/get_host_os.sh")
 if [[ $(bash "${vagrant_dir}/scripts/get_config_value.sh" "environment_composer_prefer_source") == 1 ]]; then
     # prefer-source is slow but guarantees that there will be no issues related to max path length on Windows
-    ${php_executable} ${composer_phar} --ignore-platform-reqs --prefer-source "$@"
+    ${php_executable} "${composer_phar}" --ignore-platform-reqs --prefer-source "$@"
 else
-    ${php_executable} ${composer_phar} --ignore-platform-reqs "$@"
+    ${php_executable} "${composer_phar}" --ignore-platform-reqs "$@"
 fi
 
-if [ ! ${auth_json_already_exists} = 1 ] && [ -f "${current_dir}/auth.json" ]; then
+if [[ ! ${auth_json_already_exists} = 1 ]] && [[ -f "${current_dir}/auth.json" ]]; then
     rm "${current_dir}/auth.json"
 fi

scripts/host/configure_php_storm.sh

@@ -5,7 +5,7 @@ vagrant_dir=$(cd "$(dirname "$0")/../.."; pwd)
 # Enable trace printing and exit on the first error
 set +x
 
-cd ${vagrant_dir}
+cd "${vagrant_dir}"
 ssh_port=$(bash "${vagrant_dir}/scripts/get_config_value.sh" "guest_forwarded_ssh_port")
 magento_host_name=$(bash "${vagrant_dir}/scripts/get_config_value.sh" "magento_host_name")
 
@@ -32,8 +32,8 @@ sed -i.back "s|<host_name>|${magento_host_name}|g" "${vagrant_dir}/.idea/deploym
 sed -i.back "s|<host_name>|${magento_host_name}|g" "${vagrant_dir}/.idea/deployment.xml"
 sed -i.back "s|<host_name>|${magento_host_name}|g" "${vagrant_dir}/.idea/.name"
 sed -i.back "s|<host_name>|${magento_host_name}|g" "${vagrant_dir}/.idea/modules.xml"
-rm -rf ${vagrant_dir}/.idea/*.back
-rm -f ${vagrant_dir}/.idea/.name.back
+rm -rf "${vagrant_dir}/.idea/*.back"
+rm -f "${vagrant_dir}/.idea/.name.back"
 
 mv "${vagrant_dir}/.idea/host_name.iml" "${vagrant_dir}/.idea/${magento_host_name}.iml"
 

scripts/host/get_path_to_php.sh

@@ -6,7 +6,7 @@ vagrant_dir=$(cd "$(dirname "$0")/../.."; pwd)
 set -ex
 
 # Find path to available PHP
-if [ -f ${vagrant_dir}/lib/php/php.exe ]; then
+if [[ -f ${vagrant_dir}/lib/php/php.exe ]]; then
     php_executable="${vagrant_dir}/lib/php/php"
 else
     php_executable="php"

scripts/host/install_php.sh

@@ -7,13 +7,13 @@ host_os=$(bash "${vagrant_dir}/scripts/host/get_host_os.sh")
 set -ex
 
 if [[ ${host_os} == "Windows" ]]; then
-    curl http://windows.php.net/downloads/releases/archives/php-5.6.9-nts-Win32-VC11-x86.zip -o ${vagrant_dir}/lib/php.zip
-    unzip -q ${vagrant_dir}/lib/php.zip -d ${vagrant_dir}/lib/php
-    rm -f ${vagrant_dir}/lib/php.zip
+    curl http://windows.php.net/downloads/releases/archives/php-5.6.9-nts-Win32-VC11-x86.zip -o "${vagrant_dir}/lib/php.zip"
+    unzip -q "${vagrant_dir}/lib/php.zip" -d "${vagrant_dir}/lib/php"
+    rm -f "${vagrant_dir}/lib/php.zip"
     cp "${vagrant_dir}/lib/php/php.ini-development" "${vagrant_dir}/lib/php/php.ini"
     sed -i.back 's|; extension_dir = "ext"|extension_dir = "ext"|g' "${vagrant_dir}/lib/php/php.ini"
     sed -i.back 's|;extension=php_openssl.dll|extension=php_openssl.dll|g' "${vagrant_dir}/lib/php/php.ini"
-    rm -rf ${vagrant_dir}/lib/php/*.back
+    rm -rf "${vagrant_dir}/lib/php/*.back"
 fi
 
 php_executable=$(bash "${vagrant_dir}/scripts/host/get_path_to_php.sh")

scripts/provision/configure_environment.sh

@@ -15,15 +15,15 @@ vagrant_dir="/vagrant"
 # Enable Magento virtual host
 custom_virtual_host_config="${vagrant_dir}/etc/magento2_virtual_host.conf"
 default_virtual_host_config="${vagrant_dir}/etc/magento2_virtual_host.conf.dist"
-if [ -f ${custom_virtual_host_config} ]; then
+if [[ -f ${custom_virtual_host_config} ]]; then
     virtual_host_config=${custom_virtual_host_config}
 else
     virtual_host_config=${default_virtual_host_config}
 fi
 enabled_virtual_host_config="/etc/apache2/sites-available/magento2.conf"
-cp ${virtual_host_config}  ${enabled_virtual_host_config}
-sed -i "s|<host>|${magento_host_name}|g" ${enabled_virtual_host_config}
-sed -i "s|<guest_magento_dir>|${guest_magento_dir}|g" ${enabled_virtual_host_config}
+cp "${virtual_host_config}" "${enabled_virtual_host_config}"
+sed -i "s|<host>|${magento_host_name}|g" "${enabled_virtual_host_config}"
+sed -i "s|<guest_magento_dir>|${guest_magento_dir}|g" "${enabled_virtual_host_config}"
 a2ensite magento2.conf
 
 # Disable default virtual host
@@ -38,8 +38,8 @@ if [ -f ${composer_auth_json} ]; then
     if [ ! -d /home/vagrant/.composer ] ; then
       sudo -H -u vagrant bash -c 'mkdir /home/vagrant/.composer'
     fi
-    if [ -f ${composer_auth_json} ]; then
-        cp ${composer_auth_json} /home/vagrant/.composer/auth.json
+    if [[ -f ${composer_auth_json} ]]; then
+        cp "${composer_auth_json}" "/home/vagrant/.composer/auth.json"
     fi
 fi
 

scripts/provision/configure_environment_recurring.sh

@@ -5,7 +5,7 @@ function process_php_config () {
 
     for php_ini_path in "${php_ini_paths[@]}"
     do
-        if [ -f ${php_ini_path} ]; then
+        if [[ -f ${php_ini_path} ]]; then
             echo "date.timezone = America/Chicago" >> ${php_ini_path}
             sed -i "s|;include_path = \".:/usr/share/php\"|include_path = \".:/usr/share/php:${guest_magento_dir}/vendor/phpunit/phpunit\"|g" ${php_ini_path}
             sed -i "s|display_errors = Off|display_errors = On|g" ${php_ini_path}
@@ -32,12 +32,12 @@ use_php7=$4
 vagrant_dir="/vagrant"
 
 # Remove configs from host in case of force stop of virtual machine before linking restored ones
-cd ${vagrant_dir}/etc && mv guest/.gitignore guest_gitignore.back && rm -rf guest && mkdir guest && mv guest_gitignore.back guest/.gitignore
-bash ${vagrant_dir}/scripts/guest/link_configs
+cd "${vagrant_dir}/etc" && mv guest/.gitignore guest_gitignore.back && rm -rf guest && mkdir guest && mv guest_gitignore.back guest/.gitignore
+bash "${vagrant_dir}/scripts/guest/link_configs"
 
 # Make sure configs are restored on system halt and during reboot
 rm -f /etc/init.d/unlink-configs
-cp ${vagrant_dir}/scripts/guest/unlink_configs /etc/init.d/unlink-configs
+cp "${vagrant_dir}/scripts/guest/unlink_configs" /etc/init.d/unlink-configs
 if [ ! -f /etc/rc0.d/K04-unlink-configs ]; then
     ln -s /etc/init.d/unlink-configs /etc/rc0.d/K04-unlink-configs
     ln -s /etc/init.d/unlink-configs /etc/rc1.d/S04-unlink-configs
@@ -49,7 +49,7 @@ if [ ! -f /etc/rc0.d/K04-unlink-configs ]; then
 fi
 
 # Upgrade existing environment
-if [ -f ${vagrant_dir}/.idea/deployment.xml ]; then
+if [[ -f ${vagrant_dir}/.idea/deployment.xml ]]; then
     sed -i.back "s|magento2ce/var/generation|magento2ce/var|g" "${vagrant_dir}/.idea/deployment.xml"
 fi