Skip to content

Commit

Permalink
Add shell to ExecuteAction (#1430)
Browse files Browse the repository at this point in the history
* Add shell to ExecuteAction

* Update to 2.38.1

* Add shell argument to jsons
  • Loading branch information
balazs-vimn authored Apr 7, 2024
1 parent 6694943 commit 1645d41
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
6 changes: 5 additions & 1 deletion Sources/ProjectSpec/Scheme.swift
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,12 @@ public struct Scheme: Equatable {
public var script: String
public var name: String
public var settingsTarget: String?
public init(name: String, script: String, settingsTarget: String? = nil) {
public var shell: String?
public init(name: String, script: String, shell: String? = nil, settingsTarget: String? = nil) {
self.script = script
self.name = name
self.settingsTarget = settingsTarget
self.shell = shell
}
}

Expand Down Expand Up @@ -400,6 +402,7 @@ extension Scheme.ExecutionAction: JSONObjectConvertible {
script = try jsonDictionary.json(atKeyPath: "script")
name = jsonDictionary.json(atKeyPath: "name") ?? "Run Script"
settingsTarget = jsonDictionary.json(atKeyPath: "settingsTarget")
shell = jsonDictionary.json(atKeyPath: "shell")
}
}

Expand All @@ -409,6 +412,7 @@ extension Scheme.ExecutionAction: JSONEncodable {
"script": script,
"name": name,
"settingsTarget": settingsTarget,
"shell": shell
]
}
}
Expand Down
7 changes: 6 additions & 1 deletion Sources/XcodeGenKit/SchemeGenerator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,12 @@ public class SchemeGenerator {
.first { settingsTarget == $0.buildableReference.blueprintName }?
.buildableReference
}
return XCScheme.ExecutionAction(scriptText: action.script, title: action.name, environmentBuildable: environmentBuildable)
return XCScheme.ExecutionAction(
scriptText: action.script,
title: action.name,
shellToInvoke: action.shell,
environmentBuildable: environmentBuildable
)
}

let schemeTarget: ProjectTarget?
Expand Down

0 comments on commit 1645d41

Please sign in to comment.