fixed "binary operator expected" failures

Author: riconeitzel

init_project.sh

@@ -24,7 +24,7 @@ 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
+if [[ ! -f "${vagrant_dir}/etc/config.yaml" ]]; then
     cp "${config_path}.dist" "${config_path}"
 fi
 random_ip=$(( ( RANDOM % 240 )  + 12 ))
@@ -46,18 +46,18 @@ 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
-    if [ ${force_codebase_cleaning} -eq 1 ]; then
     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"
+    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
@@ -69,7 +69,7 @@ if [ ! -d ${magento_ce_dir} ]; then
     # 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
+    if [[ -n "${repository_url_ee}" ]]; then
         git clone ${repository_url_ee} "${magento_ee_dir}"
     fi
 fi
@@ -84,10 +84,10 @@ vagrant up
 
 set +x
 echo "Configuring PhpStorm..."
-if [ ${force_project_cleaning} -eq 1 ] && [ ${force_phpstorm_config_cleaning} -eq 1 ]; then
+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/host/composer.sh

@@ -16,19 +16,19 @@ 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
+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
 
-if [ ! ${auth_json_already_exists} = 1 ] && [ -f ${composer_auth_json} ]; then
 cd "${current_dir}"
+if [[ ! ${auth_json_already_exists} = 1 ]] && [[ -f ${composer_auth_json} ]]; then
     cp "${composer_auth_json}" "${current_dir}/auth.json"
 fi
 
@@ -40,6 +40,6 @@ else
     ${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/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/provision/configure_environment.sh

@@ -15,7 +15,7 @@ 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}
@@ -38,7 +38,7 @@ 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
+    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}
@@ -50,7 +50,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