1 files changed, 14 insertions, 35 deletions

diff --git a/coin/provisioning/common/macos/install_xcode.sh b/coin/provisioning/common/macos/install_xcode.sh
index 5eddb72f..440f19b9 100755
--- a/coin/provisioning/common/macos/install_xcode.sh
+++ b/coin/provisioning/common/macos/install_xcode.sh
@@ -1,37 +1,9 @@
 #!/usr/bin/env bash
+# Copyright (C) 2021 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
+# shellcheck source=./../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 
 # This script installs Xcode
 # Prerequisites: Have Xcode prefetched to local cache as xz compressed.
@@ -51,17 +23,24 @@ function InstallXCode() {
     echo "Uncompressing and installing '$sourceFile'"
     if [[ $sourceFile =~ tar ]]; then
         cd /Applications/ && sudo tar -zxf "$sourceFile"
+    elif [[ $sourceFile =~ "xip" ]]; then
+        if [[ $sourceFile =~ "http" ]]; then
+            Download "$sourceFile" "/Applications/Xcode_$version.xip"
+            cd /Applications/ && xip -x "Xcode_$version.xip"
+        else
+            cd /Applications/ && xip -x "$sourceFile"
+        fi
     else
         xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi)
     fi
 
     echo "Versioning application bundle"
-    majorVersion=$(echo $version | cut -d '.' -f 1)
+    majorVersion=$(echo "$version" | cut -d '.' -f 1)
     versionedAppBundle="/Applications/Xcode${majorVersion}.app"
-    sudo mv /Applications/Xcode.app ${versionedAppBundle}
+    sudo mv /Applications/Xcode*.app "${versionedAppBundle}"
 
     echo "Selecting Xcode"
-    sudo xcode-select --switch ${versionedAppBundle}
+    sudo xcode-select --switch "${versionedAppBundle}"
 
     echo "Accept license"
     sudo xcodebuild -license accept