Merge pull request #182 from tahirmt/add-select-option-to-install

Add select option to install
XcodesOrg · Oct 26, 2022 · f9771ca · f9771ca
2 parents 9fb3593 + 77d2e29
commit f9771ca
Show file tree

Hide file tree

Showing 3 changed files with 141 additions and 92 deletions.
diff --git a/Sources/XcodesKit/XcodeInstaller.swift b/Sources/XcodesKit/XcodeInstaller.swift
@@ -166,13 +166,13 @@ public final class XcodeInstaller {
         case aria2(Path)
     }
 
-    public func install(_ installationType: InstallationType, dataSource: DataSource, downloader: Downloader, destination: Path, experimentalUnxip: Bool = false, emptyTrash: Bool, noSuperuser: Bool) -> Promise<Void> {
+    public func install(_ installationType: InstallationType, dataSource: DataSource, downloader: Downloader, destination: Path, experimentalUnxip: Bool = false, emptyTrash: Bool, noSuperuser: Bool) -> Promise<InstalledXcode> {
         return firstly { () -> Promise<InstalledXcode> in
             return self.install(installationType, dataSource: dataSource, downloader: downloader, destination: destination, attemptNumber: 0, experimentalUnxip: experimentalUnxip, emptyTrash: emptyTrash, noSuperuser: noSuperuser)
         }
-        .done { xcode in
+        .map { xcode in
             Current.logging.log("\nXcode \(xcode.version.descriptionWithoutBuildMetadata) has been installed to \(xcode.path.string)".green)
-            Current.shell.exit(0)
+            return xcode
         }
     }
 

diff --git a/Sources/XcodesKit/XcodeSelect.swift b/Sources/XcodesKit/XcodeSelect.swift
@@ -4,7 +4,7 @@ import Path
 import Version
 import Rainbow
 
-public func selectXcode(shouldPrint: Bool, pathOrVersion: String, directory: Path) -> Promise<Void> {
+public func selectXcode(shouldPrint: Bool, pathOrVersion: String, directory: Path, fallbackToInteractive: Bool = true) -> Promise<Void> {
     firstly { () -> Promise<ProcessOutput> in
         Current.shell.xcodeSelectPrintPath()
     }
@@ -48,18 +48,23 @@ public func selectXcode(shouldPrint: Bool, pathOrVersion: String, directory: Pat
                 return Promise.value(())
             }
 
-            return selectXcodeAtPath(pathToSelect)
+            let selectPromise = selectXcodeAtPath(pathToSelect)
                 .done { output in
                     Current.logging.log("Selected \(output.out)".green)
                     Current.shell.exit(0)
                 }
-                .recover { _ in
-                    selectXcodeInteractively(currentPath: output.out, directory: directory)
-                        .done { output in
-                            Current.logging.log("Selected \(output.out)".green)
-                            Current.shell.exit(0)
-                        }
-                }
+            if fallbackToInteractive {
+                return selectPromise
+                    .recover { _ in
+                        selectXcodeInteractively(currentPath: output.out, directory: directory)
+                            .done { output in
+                                Current.logging.log("Selected \(output.out)".green)
+                                Current.shell.exit(0)
+                            }
+                    }
+            } else {
+                return selectPromise
+            }
         }
     }
 }