Merge branch 'release/0.1.0'

ctreffs · Mar 26, 2020 · 8a240b9 · 8a240b9
2 parents 774ccf3 + c86f1cd
commit 8a240b9
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 4 deletions.
diff --git a/Sources/Simctl/SimctlClient.swift b/Sources/Simctl/SimctlClient.swift
@@ -288,7 +288,7 @@ extension SimctlClient {
                 return .statusBarOverrides
 
             case .clearStatusBarOverrides:
-                return .statusBarOverridesClear
+                return .statusBarOverrides
             }
         }
 

diff --git a/Sources/SimctlCLI/Commands.swift b/Sources/SimctlCLI/Commands.swift
@@ -120,7 +120,7 @@ extension ShellOutCommand {
     /// Usage: simctl status_bar <device> clear
     /// - Parameter device: The device Udid
     static func simctlClearStatusBarOverrides(device: UUID) -> ShellOutCommand {
-        .init(string: "status_bar \(device.uuidString) clear")
+        .init(string: simctl("status_bar \(device.uuidString) clear"))
     }
 
     /// Set status bar overrides

diff --git a/Sources/SimctlCLI/SimctlServer.swift b/Sources/SimctlCLI/SimctlServer.swift
@@ -271,7 +271,7 @@ final class SimctlServer {
     /// Callback to be executed on clear status bar override request.
     /// - Parameter closure: The closure to be executed.
     func onClearStatusBarOverrides(_ closure: @escaping (UUID, String?) -> Result<String, Swift.Error>) {
-        server.GET[ServerPath.statusBarOverridesClear.rawValue] = { request in
+        server.GET[ServerPath.statusBarOverrides.rawValue] = { request in
             guard let deviceId = request.headerValue(for: .deviceUdid, UUID.init) else {
                 return .badRequest(.text("Device Udid missing or corrupt."))
             }

diff --git a/Sources/SimctlShared/SimctlShared.swift b/Sources/SimctlShared/SimctlShared.swift
@@ -83,7 +83,6 @@ public enum ServerPath: String {
     case iCloudSync = "/simctl/iCloudSync"
     case uninstallApp = "/simctl/uninstallApp"
     case statusBarOverrides = "/simctl/statusBarOverrides"
-    case statusBarOverridesClear = "/simctl/statusBarOverridesClear"
 }
 
 /// Some permission changes will terminate the application if running.

diff --git a/bin/SimctlCLI b/bin/SimctlCLI