From 2a0836a763beca66e9c7685677e8423e99222499 Mon Sep 17 00:00:00 2001
From: Leonid Lapshin <v-llapshin@microsoft.com>
Date: Tue, 20 Oct 2020 11:45:21 +0300
Subject: [PATCH] Change "open" tool to "xip" on XCode archive extraction
 (#1840)

* change open tool to xip

* cd change to pushd and popd

Co-authored-by: Leonid Lapshin <originalnoe-nazvanie@yandex.ru>
---
 images/macos/provision/utils/xcode-utils.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/images/macos/provision/utils/xcode-utils.sh b/images/macos/provision/utils/xcode-utils.sh
index fccde9efd..7cd63b2fc 100644
--- a/images/macos/provision/utils/xcode-utils.sh
+++ b/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"