From e1c42c09cdc737c65af53aca3b700dfd8f6c09aa Mon Sep 17 00:00:00 2001
From: Joseph Duffy <commits@josephduffy.co.uk>
Date: Thu, 6 Feb 2020 11:18:13 +0000
Subject: [PATCH] Add pre-release identifier to beta Xcode versions

---
 Sources/XcodeSelect/XcodeVersion.swift | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/Sources/XcodeSelect/XcodeVersion.swift b/Sources/XcodeSelect/XcodeVersion.swift
index 5933d65..d665d59 100644
--- a/Sources/XcodeSelect/XcodeVersion.swift
+++ b/Sources/XcodeSelect/XcodeVersion.swift
@@ -13,7 +13,9 @@ public struct XcodeVersion: Comparable, CustomStringConvertible {
     
     public let version: Version
     public let build: String
-    public let isBeta: Bool
+    public var isBeta: Bool {
+        return version.prereleaseIdentifiers.contains("beta")
+    }
     
     public var description: String {
         return "Xcode\(isBeta ? " Beta" : "") \(version) (\(build))"
@@ -32,18 +34,28 @@ public struct XcodeVersion: Comparable, CustomStringConvertible {
             var format = PropertyListSerialization.PropertyListFormat.binary
             let infoPlist = try decoder.decode(XcodeInfoPlist.self, from: infoPlistData, format: &format)
             let versionPlist = try decoder.decode(XcodeVersionPlist.self, from: versionPlistData, format: &format)
-            version = versionPlist.version
+
+            if infoPlist.iconFileName.hasSuffix("Beta") {
+                version = Version(
+                    major: versionPlist.version.major,
+                    minor: versionPlist.version.minor,
+                    patch: versionPlist.version.patch,
+                    prereleaseIdentifiers: versionPlist.version.prereleaseIdentifiers + ["beta"],
+                    buildMetadataIdentifiers: versionPlist.version.buildMetadataIdentifiers
+                )
+            } else {
+                version = versionPlist.version
+            }
+
             build = versionPlist.build
-            isBeta = infoPlist.iconFileName.hasSuffix("Beta")
         } catch {
             return nil
         }
     }
 
-    public init(version: Version, build: String, isBeta: Bool) {
+    public init(version: Version, build: String) {
         self.version = version
         self.build = build
-        self.isBeta = isBeta
     }
     
 }