Remove try_catch codes from common macOS scripts

Change-Id: I66291e2da5514499387b61e01ad85a652cd24d7b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit a98b0f3d7989bedf6f0bcc1a83b52aad1d3baa3e)
Reviewed-by: Simo Fält <simo.falt@qt.io>

1 files changed, 8 insertions, 38 deletions

diff --git a/coin/provisioning/common/macos/install_xcode.sh b/coin/provisioning/common/macos/install_xcode.sh
index 1fe611b3..e569bee5 100755
--- a/coin/provisioning/common/macos/install_xcode.sh
+++ b/coin/provisioning/common/macos/install_xcode.sh
@@ -44,48 +44,18 @@
 
 
 
-# shellcheck source=../common/unix/try_catch.sh
-source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
-
-function InstallXCode()
-{
-    ExceptionCPIO=103
-    ExceptionAcceptLicense=105
-    ExceptionDeveloperMode=113
-
+function InstallXCode() {
     sourceFile=$1
     version=$2
 
-    try
-    (
-        echo "Uncompressing and installing '$sourceFile'"
-        xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi) || throw $ExceptionCPIO
-
-        echo "Accept license"
-        sudo xcodebuild -license accept || throw $ExceptionAcceptLicense
+    echo "Uncompressing and installing '$sourceFile'"
+    xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi)
 
-        echo "Enabling developer mode, so that using lldb does not require interactive password entry"
-        sudo /usr/sbin/DevToolsSecurity -enable || throw $ExceptionDeveloperMode
+    echo "Accept license"
+    sudo xcodebuild -license accept
 
-        echo "Xcode = $version" >> ~/versions.txt
-    )
-    catch || {
-        case $ex_code in
-            $ExceptionCPIO)
-                echo "Failed to unarchive .cpio."
-                exit 1;
-            ;;
-            $ExceptionDeveloperMode)
-                echo "Failed to enable developer mode."
-                exit 1;
-            ;;
-            $ExceptionAcceptLicense)
-                echo "Failed to accept license."
-                exit 1;
-            ;;
-
-        esac
-    }
+    echo "Enabling developer mode, so that using lldb does not require interactive password entry"
+    sudo /usr/sbin/DevToolsSecurity -enable
 
+    echo "Xcode = $version" >> ~/versions.txt
 }
-