Merge pull request #37 from paliarush/Minor-Fixes

Minor Fixes

Author: paliarush

scripts/guest/m-clear-cache

@@ -10,6 +10,6 @@ cd ${MAGENTO_ROOT}/pub && mv static/.htaccess static_htaccess.back && rm -rf sta
 #clear integration tests tmp
 cd ${MAGENTO_ROOT}/dev/tests/integration && mv tmp/.gitignore tmp_gitignore.back && rm -rf tmp && mkdir tmp && mv tmp_gitignore.back tmp/.gitignore
 #clear unit tests tmp
-cd ${MAGENTO_ROOT}/dev/tests/unit && rm -rf tmp && mkdir tmp
+cd ${MAGENTO_ROOT}/dev/tests/unit && mv tmp/.gitignore tmp_gitignore.back && rm -rf tmp && mkdir tmp && mv tmp_gitignore.back tmp/.gitignore
 
 echo "Magento cache cleared."

scripts/host/composer.sh

@@ -22,9 +22,14 @@ if [ ! -f ${composer_phar} ]; then
 fi
 
 # Configure composer credentials
+auth_json_already_exists=0
+if [ -f "${current_dir}/auth.json" ]; then
+    auth_json_already_exists=1
+fi
+
 cd ${current_dir}
-if [ -f ${composer_auth_json} ]; then
-    cp ${composer_auth_json} "${PWD}/auth.json"
+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")
@@ -35,6 +40,6 @@ else
     ${php_executable} ${composer_phar} --ignore-platform-reqs "$@"
 fi
 
-if [ -f "${PWD}/auth.json" ]; then
-    rm "${PWD}/auth.json"
+if [ ! ${auth_json_already_exists} = 1 ] && [ -f "${current_dir}/auth.json" ]; then
+    rm "${current_dir}/auth.json"
 fi

scripts/host/get_host_os.sh

@@ -6,6 +6,8 @@ elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
     echo "Linux"
 elif [ "$(expr substr $(uname -s) 1 5)" == "MINGW" ]; then
     echo "Windows"
+elif [ "$(expr substr $(uname -s) 1 6)" == "CYGWIN" ]; then
+    echo "Windows"
 else
     echo "Unknown host OS"
     exit 255