- Eliminated code duplication when clearing cache

Author: Alexander Paliarush

install_environment.sh

@@ -48,9 +48,9 @@ fi
 echo "date.timezone = America/Chicago" >> /etc/php5/cli/php.ini
 
 # Configure XDebug to allow remote connections from the host
-echo "xdebug.max_nesting_level=200 \
-xdebug.remote_enable=1 \
-xdebug.remote_connect_back=1" >> /etc/php5/cli/conf.d/20-xdebug.ini
+echo 'xdebug.max_nesting_level=200
+xdebug.remote_enable=1
+xdebug.remote_connect_back=1' >> /etc/php5/cli/conf.d/20-xdebug.ini
 
 # Restart Apache
 service apache2 restart
@@ -79,4 +79,4 @@ chmod -R 755 /var/www
 
 # Declare path to scripts supplied with vagrant and Magento
 magento_dir="/var/www/magento2ce"
-echo "export PATH=\$PATH:/vagrant/bin:${magento_dir}/bin" >> /home/vagrant/.profile
+echo "export PATH=\$PATH:/vagrant/bin:${magento_dir}/bin" >> /etc/profile

install_magento.sh

@@ -25,10 +25,7 @@ magento_dir="/var/www/magento2ce"
 cd ${magento_dir}
 
 # Clear cache
-mv var/.htaccess .var_htaccess.back && rm -rf var/* && mv .var_htaccess.back var/.htaccess
-mv pub/static/.htaccess pub/static_htaccess.back && rm -rf pub/static/* && mv pub/static_htaccess.back pub/static/.htaccess
-cd "${magento_dir}/dev/tests/integration" && mv tmp/.gitignore tmp_gitignore.back && rm -rf tmp/* && mv tmp_gitignore.back tmp/.gitignore
-cd "${magento_dir}/dev/tests/unit" && rm -rf tmp/*
+magento_clear_cache
 
 # Remove configuration files
 rm -f "${magento_dir}/app/etc/config.php"