Merge branch 'master' of https://github.com/nikita-bykov/virtual-environments into rework-chrome-installation

images/macos/provision/utils/utils.sh

@@ -12,7 +12,7 @@ download_with_retries() {
                 --wait 30 \
                 --retry-connrefused \
                 --retry-on-host-error \
-                --retry-on-http-error=429,500,502,503 \
+                --retry-on-http-error=404,429,500,502,503 \
                 --no-verbose
 
     if [ $? != 0 ]; then

images/macos/provision/utils/xcode-utils.sh

@@ -68,7 +68,9 @@ extractXcodeXip() {
     local XCODE_VERSION="$2"
     XCODE_XIP="${WORKING_DIR}/Xcode_${XCODE_VERSION// /_}.xip"
 
-    open -W $XCODE_XIP
+    pushd $WORKING_DIR
+    xip -x "${XCODE_XIP}"
+    popd
 
     if [[ -d "${WORKING_DIR}/Xcode-beta.app" ]]; then
         mv -f "${WORKING_DIR}/Xcode-beta.app" "${WORKING_DIR}/Xcode.app"