Guest configs editable from IDE (#29)

Author: Alexander Paliarush

scripts/guest/link_configs

@@ -1,31 +1,33 @@
 #!/usr/bin/env bash
-# See unlink_configs script
+
+function process_configs () {
+    configs_path=$1
+    configs=$2
+    for config in "${configs[@]}"
+    do
+        if [ ! -d /vagrant/etc/guest/${config} ] && [ ! -f /vagrant/etc/guest/${config} ]; then
+            if [ -d ${configs_path}/${config} ] || [ -f ${configs_path}/${config} ]; then
+                sudo rm -rf "${configs_path}/${config}.back"
+                sudo cp -rp ${configs_path}/${config} "${configs_path}/${config}.back"
+                sudo mv ${configs_path}/${config} /vagrant/etc/guest/${config}
+                sudo ln -s /vagrant/etc/guest/${config} ${configs_path}/${config}
+            fi
+        fi
+    done
+}
 
 # Enable trace printing and exit on the first error
 set -ex
 
 # Make guest configs visible and editable in the host IDE
 
 # Configs located under /etc/*
+config_dir="/etc"
+# See unlink_configs script
 configs=( apache2 php mysql varnish rabbitmq crontab cron.d timezone hosts profile profile.d )
-for config in "${configs[@]}"
-do
-    if [ ! -d /vagrant/etc/guest/${config} ] && [ ! -f /vagrant/etc/guest/${config} ]; then
-        if [ -d /etc/${config} ] || [ -f /etc/${config} ]; then
-            mv /etc/${config} /vagrant/etc/guest/${config}
-            ln -s /vagrant/etc/guest/${config} /etc/${config}
-        fi
-    fi
-done
+process_configs ${config_dir} ${configs}
 
 # Configs located under ~/*
+config_dir="/home/vagrant"
 configs=( .bashrc .composer .profile )
-for config in "${configs[@]}"
-do
-    if [ ! -d /vagrant/etc/guest/${config} ] && [ ! -f /vagrant/etc/guest/${config} ]; then
-        if [ -d /home/vagrant/${config} ] || [ -f /home/vagrant/${config} ]; then
-            mv /home/vagrant/${config} /vagrant/etc/guest/${config}
-            ln -s /vagrant/etc/guest/${config} /home/vagrant/${config}
-        fi
-    fi
-done
+process_configs ${config_dir} ${configs}

scripts/guest/unlink_configs

@@ -1,27 +1,32 @@
 #!/usr/bin/env bash
-# See link_configs script
+
+function process_configs () {
+    configs_path=$1
+    configs=$2
+    for config in "${configs[@]}"
+    do
+        if [ -L ${config_dir}/${config} ] && [ -e ${config_dir}/${config} ]; then
+            sudo rm ${config_dir}/${config}
+            sudo mv /vagrant/etc/guest/${config} ${config_dir}/${config}
+        elif [ ! -e ${config_dir}/${config} ] && [ -e "${config_dir}/${config}.back" ]; then
+            sudo rm -rf ${config_dir}/${config}
+            sudo cp -rp "${config_dir}/${config}.back" ${config_dir}/${config}
+        fi
+    done
+}
 
 # Enable trace printing and exit on the first error
 set -ex
 
 # Revert configs before shutdown or reboot to allow proper services initialization on booting
 
 # Configs located under /etc/*
-configs=( apache2 php mysql varnish rabbitmq init.d crontab cron.d timezone hosts )
-for config in "${configs[@]}"
-do
-    if [ -L /etc/${config} ]; then
-        sudo rm /etc/${config}
-        sudo mv /vagrant/etc/guest/${config} /etc/${config}
-    fi
-done
+config_dir="/etc"
+# See link_configs script
+configs=( apache2 php mysql varnish rabbitmq crontab cron.d timezone hosts profile profile.d )
+process_configs ${config_dir} ${configs}
 
 # Configs located under ~/*
+config_dir="/home/vagrant"
 configs=( .bashrc .composer .profile )
-for config in "${configs[@]}"
-do
-    if [ -L /home/vagrant/${config} ]; then
-        sudo rm /home/vagrant/${config}
-        sudo mv /vagrant/etc/guest/${config} /home/vagrant/${config}
-    fi
-done
+process_configs ${config_dir} ${configs}

scripts/provision/configure_environment_recurring.sh

@@ -3,16 +3,26 @@
 # Enable trace printing and exit on the first error
 set +x
 
-link_configs
+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
 
 # Make sure configs are restored on system halt and during reboot
-if [ ! -f /etc/init.d/K04-unlink-configs ]; then
-    ln -s /vagrant/scripts/guest/unlink_configs /etc/init.d/K04-unlink-configs
-    ln -s /etc/init.d/K04-unlink-configs /etc/rc0.d/K04-unlink-configs
-    ln -s /etc/init.d/K04-unlink-configs /etc/rc6.d/K04-unlink-configs
+rm -f /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
+    ln -s /etc/init.d/unlink-configs /etc/rc2.d/S04-unlink-configs
+    ln -s /etc/init.d/unlink-configs /etc/rc3.d/S04-unlink-configs
+    ln -s /etc/init.d/unlink-configs /etc/rc4.d/S04-unlink-configs
+    ln -s /etc/init.d/unlink-configs /etc/rc5.d/S04-unlink-configs
+    ln -s /etc/init.d/unlink-configs /etc/rc6.d/K04-unlink-configs
 fi
 
 # Upgrade existing environment
-if [ -f /vagrant/.idea/deployment.xml ]; then
-    sed -i.back "s|magento2ce/var/generation|magento2ce/var|g" "/vagrant/.idea/deployment.xml"
+if [ -f ${vagrant_dir}/.idea/deployment.xml ]; then
+    sed -i.back "s|magento2ce/var/generation|magento2ce/var|g" "${vagrant_dir}/.idea/deployment.xml"
 fi