Improved automatic deployment configuration in PHP Storm

Author: Alexander Paliarush

Diff for: init_project.sh

@@ -35,10 +35,13 @@ if [ ! -d ${magento_ce_dir} ]; then
     fi
 fi
 
-use_nfs=$(bash "${vagrant_dir}/scripts/host/shell/get_variable_value.sh" "guest_use_nfs")
+
 var_generation_dir="${magento_ce_dir}/var/generation"
-if [[ ! -d ${var_generation_dir} ]] && [[ ${use_nfs} == 0 ]] ; then
-    mkdir ${var_generation_dir}
+if [ ! -d ${var_generation_dir} ] ; then
+    host_os=$(bash "${vagrant_dir}/scripts/host/shell/get_host_os.sh")
+    if [[ ${host_os} == "Windows" || $(bash "${vagrant_dir}/scripts/host/shell/get_variable_value.sh" "guest_use_nfs") == 0 ]]; then
+        mkdir ${var_generation_dir}
+    fi
 fi
 
 # Update Magento dependencies via Composer

Diff for: scripts/host/php-storm-configs/deployment.xml

@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData">
+  <component name="PublishConfigData" serverName="<host_name>"<auto_upload_attributes>>
     <serverData>
       <paths name="<host_name>">
         <serverdata>
           <mappings>
-            <mapping deploy="$PROJECT_DIR$/magento2ce" local="$PROJECT_DIR$/magento2ce" web="/" />
+            <mapping deploy="<magento_guest_path>" local="$PROJECT_DIR$/magento2ce" web="/" />
           </mappings>
+          <excludedPaths>
+            <excludedPath local="true" path="$PROJECT_DIR$/magento2ce/app/etc" />
+            <excludedPath local="true" path="$PROJECT_DIR$/magento2ce/var/generation" />
+          </excludedPaths>
         </serverdata>
       </paths>
     </serverData>
+    <auto_upload_option>
   </component>
 </project>

Diff for: scripts/host/shell/configure_php_storm.sh

@@ -14,11 +14,23 @@ cp -R "${vagrant_dir}/scripts/host/php-storm-configs/." "${vagrant_dir}/.idea/"
 
 enabled_virtual_host_config="/etc/apache2/sites-available/magento2.conf"
 
+host_os=$(bash "${vagrant_dir}/scripts/host/shell/get_host_os.sh")
+if [[ ${host_os} == "Windows" || $(bash "${vagrant_dir}/scripts/host/shell/get_variable_value.sh" "guest_use_nfs") == 0 ]]; then
+    sed -i.back "s|<magento_guest_path>|/var/www/magento2ce|g" "${vagrant_dir}/.idea/deployment.xml"
+    sed -i.back 's|<auto_upload_attributes>| autoUpload="Always" autoUploadExternalChanges="true"|g' "${vagrant_dir}/.idea/deployment.xml"
+    sed -i.back 's|<auto_upload_option>|<option name="myAutoUpload" value="ALWAYS" />|g' "${vagrant_dir}/.idea/deployment.xml"
+else
+    sed -i.back "s|<magento_guest_path>|\$PROJECT_DIR\$/magento2ce|g" "${vagrant_dir}/.idea/deployment.xml"
+    sed -i.back 's|<auto_upload_attributes>||g' "${vagrant_dir}/.idea/deployment.xml"
+    sed -i.back 's|<auto_upload_option>||g' "${vagrant_dir}/.idea/deployment.xml"
+fi
+
 sed -i.back "s|<host_name>|${magento_host_name}|g" "${vagrant_dir}/.idea/webServers.xml"
 sed -i.back "s|<ssh_port>|${ssh_port}|g" "${vagrant_dir}/.idea/webServers.xml"
 sed -i.back "s|<host_name>|${magento_host_name}|g" "${vagrant_dir}/.idea/php.xml"
 sed -i.back "s|<ssh_port>|${ssh_port}|g" "${vagrant_dir}/.idea/php.xml"
 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/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