Add Keychain

onmyway133 · Feb 17, 2022 · 4a85b06 · 4a85b06
1 parent 9dfbefa
commit 4a85b06
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Examples/CLI/CLI/Script.swift b/Examples/CLI/CLI/Script.swift
@@ -58,4 +58,3 @@ struct Script {
         )
     }
 }
-
diff --git a/Sources/Swiftlane/Actions/iOS/Keychain.swift b/Sources/Swiftlane/Actions/iOS/Keychain.swift
@@ -31,8 +31,9 @@ public struct Keychain {
         }
 
         var args = Args()
-        args["create-keychain"] = path.rawValue.path.surroundingWithQuotes()
+        args.flag("create-keychain")
         args["-p"] = password.surroundingWithQuotes()
+        args.suffix = [path.rawValue.path.surroundingWithQuotes()]
 
         try Settings.cli.run(
             program: "security",
@@ -47,8 +48,9 @@ public struct Keychain {
 
     public func unlock() async throws {
         var args = Args()
-        args["unlock-keychain"] = path.rawValue.path.surroundingWithQuotes()
+        args.flag("unlock-keychain")
         args["-p"] = password.surroundingWithQuotes()
+        args.suffix = [path.rawValue.path.surroundingWithQuotes()]
 
         try Settings.cli.run(
             program: "security",

diff --git a/Sources/Swiftlane/Library/Core/Args.swift b/Sources/Swiftlane/Library/Core/Args.swift
@@ -10,6 +10,7 @@ import Foundation
 public struct Args {
     private var map: [String: String] = [:]
     private var mapMultiple: [String: Set<String>] = [:]
+    public var suffix: [String] = []
 
     public subscript(_ key: String) -> String? {
         get {
@@ -73,7 +74,7 @@ public struct Args {
             .sorted(by: sortArguments)
             .joined(separator: " ")
 
-        return [mapString, mapMultipleString].joined(separator: " ")
+        return ([mapString, mapMultipleString] + suffix).joined(separator: " ")
     }
 
     // Ensure non-hyphen arguments come first